[Commit-gnuradio] [gnuradio] 08/08: 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 a18e480c8c751247d510480f7d0fca7c73775472
Merge: 69edea3 a6becbd
Author: Johnathan Corgan <address@hidden>
Date:   Wed Nov 11 14:55:31 2015 -0800

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

 gnuradio-runtime/python/gnuradio/gr/gateway.py |   7 ++
 grc/base/Block.py                              |   2 +-
 grc/base/Param.py                              |   4 +
 grc/blocks/epy_block.xml                       |  45 ++++++++++
 grc/gui/ActionHandler.py                       |  16 +++-
 grc/gui/Actions.py                             |   1 +
 grc/gui/CMakeLists.txt                         |   1 +
 grc/gui/Constants.py                           |  14 +--
 grc/gui/Dialogs.py                             |  23 ++++-
 grc/gui/FlowGraph.py                           |  37 +++++++-
 grc/gui/Param.py                               | 119 +++++++++++++++++++++----
 grc/gui/PropsDialog.py                         |   8 +-
 grc/gui/external_editor.py                     |  93 +++++++++++++++++++
 grc/python/Block.py                            |  96 +++++++++++++++++++-
 grc/python/CMakeLists.txt                      |   1 +
 grc/python/Generator.py                        |  27 ++++--
 grc/python/Param.py                            |  19 ++--
 grc/python/epy_block_io.py                     |  97 ++++++++++++++++++++
 18 files changed, 560 insertions(+), 50 deletions(-)