[Commit-gnuradio] [gnuradio] 16/16: 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 0f9b29ae4cbb2e3e46abea3ab2475b784d36dab8
Merge: 7b2088e bd97903e
Author: Johnathan Corgan <address@hidden>
Date:   Sat Oct 3 11:53:34 2015 -0700

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

 grc/base/FlowGraph.py      |  54 ++++++++++++++++++++-
 grc/blocks/options.xml     |  31 +++++++++++-
 grc/gui/ActionHandler.py   |  65 +++++++++++++++----------
 grc/gui/Actions.py         |  74 ++++++++++++++++++-----------
 grc/gui/Bars.py            | 115 +++++++++++++++++++++++++++++----------------
 grc/gui/Block.py           |  44 +++++++++++++----
 grc/gui/Constants.py       |   3 +-
 grc/gui/FileDialogs.py     |  15 +++++-
 grc/gui/FlowGraph.py       |   2 +
 grc/gui/MainWindow.py      |  12 +++--
 grc/gui/Param.py           |  11 ++++-
 grc/python/Constants.py    |  11 +++++
 grc/python/Generator.py    |  14 ++----
 grc/python/Param.py        |  40 +++++++---------
 grc/python/flow_graph.tmpl |  66 +++++++++++++++++++-------
 15 files changed, 395 insertions(+), 162 deletions(-)