[Commit-gnuradio] [gnuradio] 04/08: Merge branch 'maint'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit f93f2ef3d80cd217a3a995470a51b9ff8df02978
Merge: d56f675 a99f8ac
Author: Johnathan Corgan <address@hidden>
Date:   Sat Jun 25 10:07:53 2016 -0700

    Merge branch 'maint'

 gnuradio-runtime/lib/top_block_impl.cc    | 20 ++++++++++++++------
 gnuradio-runtime/lib/top_block_impl.h     |  1 +
 gr-blocks/python/blocks/qa_hier_block2.py | 26 +++++++++++++++++++++++++-
 3 files changed, 40 insertions(+), 7 deletions(-)