[Commit-gnuradio] [gnuradio] 08/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 99c3de63acb0f6d8296538e296e7c9c567fa3fbc
Merge: bc60fdb 79f6dc8
Author: Johnathan Corgan <address@hidden>
Date:   Thu Apr 14 12:41:53 2016 -0700

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

 gr-blocks/CMakeLists.txt                                |  1 +
 {grc/blocks => gr-blocks/grc}/blks2_error_rate.xml      |  1 +
 {grc/blocks => gr-blocks/grc}/blks2_selector.xml        |  1 +
 {grc/blocks => gr-blocks/grc}/blks2_tcp_sink.xml        |  1 +
 {grc/blocks => gr-blocks/grc}/blks2_tcp_source.xml      |  1 +
 {grc/blocks => gr-blocks/grc}/blks2_valve.xml           |  1 +
 gr-blocks/grc/blocks_block_tree.xml                     |  7 ++++++-
 {grc/blocks => gr-blocks/grc}/xmlrpc_client.xml         |  0
 {grc/blocks => gr-blocks/grc}/xmlrpc_server.xml         |  0
 {grc => gr-blocks/python}/grc_gnuradio/CMakeLists.txt   |  8 +++++---
 {grc => gr-blocks/python}/grc_gnuradio/README           |  0
 {grc => gr-blocks/python}/grc_gnuradio/__init__.py      |  0
 .../python}/grc_gnuradio/blks2/__init__.py              | 10 +++++++---
 .../python}/grc_gnuradio/blks2/error_rate.py            |  0
 .../python}/grc_gnuradio/blks2/selector.py              |  0
 {grc => gr-blocks/python}/grc_gnuradio/blks2/tcp.py     |  0
 gr-digital/CMakeLists.txt                               |  1 +
 {grc/blocks => gr-digital/grc}/blks2_packet_decoder.xml |  1 +
 {grc/blocks => gr-digital/grc}/blks2_packet_encoder.xml |  1 +
 {grc => gr-digital/python}/grc_gnuradio/CMakeLists.txt  | 15 +++++----------
 {grc => gr-digital/python}/grc_gnuradio/blks2/packet.py |  0
 grc/CMakeLists.txt                                      |  1 -
 grc/blocks/block_tree.xml                               | 17 -----------------
 grc/gui/ActionHandler.py                                |  3 +++
 grc/gui/Actions.py                                      |  6 ++++++
 grc/gui/Bars.py                                         |  1 +
 grc/gui/FlowGraph.py                                    |  6 +++++-
 grc/python/flow_graph.tmpl                              |  9 +++++++--
 28 files changed, 54 insertions(+), 38 deletions(-)