[Commit-gnuradio] [gnuradio] 22/23: 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 ee06ad1eb9437d1db989076ca61ed0e4573244ec
Merge: 27e8311 dcc09de
Author: Johnathan Corgan <address@hidden>
Date:   Sat Nov 28 12:52:03 2015 -0800

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

 grc/base/FlowGraph.py      |   2 +-
 grc/base/Platform.py       |   3 +-
 grc/blocks/options.xml     |   8 ++
 grc/gui/ActionHandler.py   |   9 +-
 grc/gui/Actions.py         |   9 +-
 grc/gui/Bars.py            | 124 ++++++++++++++-----
 grc/gui/Block.py           |  34 ++++++
 grc/gui/BlockTreeWindow.py |  59 ++++++---
 grc/gui/Dialogs.py         |  80 +++++++++---
 grc/gui/FlowGraph.py       |  21 +++-
 grc/gui/MainWindow.py      |  10 +-
 grc/gui/Messages.py        |  81 +++++++-----
 grc/gui/Param.py           |   2 -
 grc/gui/Preferences.py     |  35 ++++--
 grc/gui/external_editor.py |  20 ++-
 grc/python/Block.py        |  27 ++--
 grc/python/FlowGraph.py    |  21 +++-
 grc/python/Platform.py     | 100 +++++++++++++--
 grc/python/extract_docs.py | 298 +++++++++++++++++++++++++++++++++++++++------
 19 files changed, 759 insertions(+), 184 deletions(-)