[Commit-gnuradio] [gnuradio] 13/13: 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 65d6523bf2b6d223766d07e250658bd671dfe663
Merge: 474f88a e98dee4
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jul 24 08:19:24 2015 -0700

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

 grc/base/Constants.py             |  2 +
 grc/base/Param.py                 |  2 +-
 grc/blocks/.gitignore             |  1 +
 grc/blocks/CMakeLists.txt         | 22 ++++++++-
 grc/blocks/options.xml            | 22 +++++----
 grc/blocks/variable_struct.xml.py | 98 +++++++++++++++++++++++++++++++++++++++
 grc/grc.conf.in                   |  2 +
 grc/gui/ActionHandler.py          | 10 +++-
 grc/gui/Actions.py                | 31 +++++++++----
 grc/gui/Bars.py                   |  2 +
 grc/gui/Block.py                  | 22 +++++----
 grc/gui/Constants.py              | 74 +++++++++++++++++++----------
 grc/gui/Platform.py               |  2 +-
 grc/gui/Port.py                   | 46 +++++++++---------
 grc/gui/Preferences.py            | 98 ++++++++++++++++++++++++---------------
 grc/gui/PropsDialog.py            | 58 +++++++++++++++++++----
 grc/python/Block.py               | 40 ++++++++++------
 grc/python/FlowGraph.py           |  1 -
 grc/python/Generator.py           | 37 +++++++++++++--
 grc/python/Port.py                | 13 ++----
 grc/python/default_flow_graph.grc |  4 +-
 grc/python/flow_graph.tmpl        | 33 +++++++++----
 22 files changed, 459 insertions(+), 161 deletions(-)