[Commit-gnuradio] [gnuradio] 02/03: Merge remote-tracking branch 'martin/blocks/stream_mux'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 1138fa7ec439ba3bd503efbe36e93bc25d3f31ac
Merge: 9e398c6 1da5346
Author: Johnathan Corgan <address@hidden>
Date:   Mon Mar 31 11:17:13 2014 -0700

    Merge remote-tracking branch 'martin/blocks/stream_mux'

 gr-blocks/lib/stream_mux_impl.cc         | 115 ++++++++++++++-----------------
 gr-blocks/lib/stream_mux_impl.h          |   6 +-
 gr-blocks/python/blocks/qa_stream_mux.py |  16 ++++-
 3 files changed, 69 insertions(+), 68 deletions(-)