[Commit-gnuradio] [gnuradio] 10/10: 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 7ee2f91d3c51498a6d1923fb47f47b882c9a77e5
Merge: a80edf4 91dd2fc
Author: Johnathan Corgan <address@hidden>
Date:   Sun Jun 14 09:19:03 2015 -0700

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

 gr-audio/grc/audio_sink.xml         |  2 +-
 gr-audio/grc/audio_source.xml       |  2 +-
 gr-blocks/grc/blocks_throttle.xml   |  2 +-
 gr-blocks/grc/blocks_udp_source.xml |  2 +-
 gr-fcd/grc/fcd_source_c.xml         |  2 +-
 gr-uhd/grc/gen_uhd_usrp_blocks.py   |  2 +-
 grc/base/Block.py                   | 96 +++++++++++++++++++++++++++++++++++--
 grc/base/Constants.py               |  8 ++++
 grc/base/FlowGraph.py               | 50 ++++++++++++++++---
 grc/gui/ActionHandler.py            | 42 +++++++++++-----
 grc/gui/Actions.py                  |  6 +++
 grc/gui/Bars.py                     |  3 ++
 grc/gui/Block.py                    |  2 +
 grc/gui/Colors.py                   |  1 +
 grc/gui/FlowGraph.py                | 18 +++++--
 grc/python/Block.py                 |  3 --
 grc/python/Generator.py             |  2 +-
 grc/python/block.dtd                |  5 +-
 18 files changed, 210 insertions(+), 38 deletions(-)