[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 3dd3aa361a273771ad19caf48303f6140617f1fe
Merge: 0d324dc cbdaaa0
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jul 1 08:29:00 2016 -0700

    Merge branch 'next' into next-qt5

 gnuradio-runtime/include/gnuradio/basic_block.h |  7 --
 gnuradio-runtime/include/gnuradio/tpb_detail.h  |  3 +
 gnuradio-runtime/lib/basic_block.cc             | 23 -------
 gnuradio-runtime/lib/block.cc                   |  7 +-
 gnuradio-runtime/lib/tpb_thread_body.cc         | 87 +++++++------------------
 gr-blocks/lib/pdu_to_tagged_stream_impl.cc      |  5 +-
 gr-blocks/python/blocks/qa_pdu.py               | 19 ++----
 gr-filter/examples/benchmark_filters.py         |  2 +-
 8 files changed, 39 insertions(+), 114 deletions(-)