[Commit-gnuradio] [gnuradio] 04/04: Merge remote-tracking branch 'osh/msg_shutdown_fix'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 01a326001ec9f04ce365c54a0d161e0b852e17da
Merge: a337dcb dd17d80
Author: Johnathan Corgan <address@hidden>
Date:   Tue Apr 29 10:14:45 2014 -0700

    Merge remote-tracking branch 'osh/msg_shutdown_fix'

 gnuradio-runtime/include/gnuradio/block.h          | 20 ++++++++
 gnuradio-runtime/lib/block.cc                      | 57 ++++++++++++++++++++++
 gnuradio-runtime/lib/tpb_thread_body.cc            | 17 ++++++-
 gr-blocks/python/blocks/qa_pdu.py                  |  2 +-
 .../python/digital/qa_header_payload_demux.py      |  6 +--
 5 files changed, 96 insertions(+), 6 deletions(-)