[Commit-gnuradio] [gnuradio] 06/06: 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 d598e49b4ca0a63985c675a12dc78cbc2a8931ee
Merge: a166f43 2563650
Author: Johnathan Corgan <address@hidden>
Date:   Wed Oct 1 12:27:25 2014 -0700

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

 grc/base/FlowGraph.py    | 20 +++++++++++++-------
 grc/blocks/options.xml   | 10 +++++-----
 grc/gui/ActionHandler.py | 15 +++++++++------
 grc/gui/Block.py         | 10 ++++++----
 grc/gui/Constants.py     |  7 +++++++
 grc/gui/Messages.py      |  8 +++++---
 grc/gui/Param.py         |  5 +++--
 grc/gui/Port.py          |  8 +++-----
 8 files changed, 51 insertions(+), 32 deletions(-)