[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 85fdc196b31e4ba1869f1470e2cb699df40a11dc
Merge: a342646 cf40d7d
Author: Johnathan Corgan <address@hidden>
Date:   Tue Dec 8 11:32:40 2015 -0800

    Merge branch 'next' into next-qt5

 gnuradio-runtime/include/gnuradio/basic_block.h    |  6 +-
 gnuradio-runtime/lib/flat_flowgraph.cc             | 27 ++++++-
 gnuradio-runtime/lib/flat_flowgraph.h              | 12 +++
 gnuradio-runtime/lib/hier_block2_detail.cc         | 90 ++++++++++++++--------
 .../python/gnuradio/gr/qa_hier_block2.py           | 51 +++++++++++-
 .../blocks/qa_hier_block2_message_connections.py   | 12 +--
 grc/python/flow_graph.tmpl                         |  4 +-
 7 files changed, 152 insertions(+), 50 deletions(-)