[Commit-gnuradio] [gnuradio] 04/04: Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg'

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 4c31878c2acadf393efc711719fd6593906192a4
Merge: dd5a206 7d2a390
Author: Johnathan Corgan <address@hidden>
Date:   Sat Apr 11 20:32:18 2015 -0700

    Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg'

 grc/gui/ActionHandler.py       | 10 +++++-----
 grc/gui/Param.py               |  2 ++
 grc/gui/PropsDialog.py         |  3 +--
 grc/scripts/gnuradio-companion |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)