[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch next-qt5
in repository gnuradio.

commit 100abdfaeab57ac92cad9d1358e328224e0c1990
Merge: 49e085a 2eeb3c1
Author: Johnathan Corgan <address@hidden>
Date:   Wed Apr 27 17:00:36 2016 -0700

    Merge branch 'next' into next-qt5

 gr-blocks/examples/CMakeLists.txt           |    1 +
 gr-blocks/examples/test_stream_mux_tags.grc | 1289 +++++++++++++++++++++++++++
 gr-blocks/lib/stream_mux_impl.cc            |    8 +
 gr-blocks/python/blocks/qa_stream_mux.py    |   60 +-
 grc/blocks/epy_block.xml                    |    9 +-
 grc/core/Block.py                           |   10 +-
 grc/core/generator/Generator.py             |   25 +-
 grc/core/generator/flow_graph.tmpl          |    6 +-
 grc/core/utils/epy_block_io.py              |   37 +-
 grc/core/utils/expr_utils.py                |    4 +-
 grc/gui/Block.py                            |   12 +-
 11 files changed, 1425 insertions(+), 36 deletions(-)