[Commit-gnuradio] [gnuradio] 04/14: Merge branch 'master' of git.gnuradio.org:gnuradio

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 06f820af4f9d516e63aa0801c2ee525f28942738
Merge: 6a1cd24 8c97b7c
Author: Tom Rondeau <address@hidden>
Date:   Wed May 7 20:26:49 2014 -0400

    Merge branch 'master' of git.gnuradio.org:gnuradio

 gnuradio-runtime/include/gnuradio/block.h          | 20 +++++
 gnuradio-runtime/lib/block.cc                      | 57 +++++++++++++
 gnuradio-runtime/lib/tpb_thread_body.cc            | 17 +++-
 gr-blocks/grc/blocks_block_tree.xml                |  1 +
 gr-blocks/grc/blocks_pdu_filter.xml                | 35 ++++++++
 gr-blocks/grc/blocks_pdu_remove.xml                | 29 +++++++
 gr-blocks/grc/blocks_pdu_set.xml                   | 35 ++++++++
 gr-blocks/include/gnuradio/blocks/CMakeLists.txt   |  3 +
 gr-blocks/include/gnuradio/blocks/pdu_filter.h     | 52 ++++++++++++
 gr-blocks/include/gnuradio/blocks/pdu_remove.h     | 52 ++++++++++++
 gr-blocks/include/gnuradio/blocks/pdu_set.h        | 52 ++++++++++++
 gr-blocks/lib/CMakeLists.txt                       |  3 +
 gr-blocks/lib/pdu_filter_impl.cc                   | 73 ++++++++++++++++
 gr-blocks/lib/pdu_filter_impl.h                    | 45 ++++++++++
 gr-blocks/lib/pdu_remove_impl.cc                   | 66 +++++++++++++++
 gr-blocks/lib/pdu_remove_impl.h                    | 44 ++++++++++
 gr-blocks/lib/pdu_set_impl.cc                      | 66 +++++++++++++++
 gr-blocks/lib/pdu_set_impl.h                       | 45 ++++++++++
 gr-blocks/python/blocks/qa_pdu.py                  |  2 +-
 .../python/blocks/qa_python_message_passing.py     |  6 +-
 gr-blocks/swig/blocks_swig4.i                      |  9 ++
 gr-digital/lib/hdlc_framer_pb_impl.cc              |  6 +-
 .../python/digital/qa_header_payload_demux.py      |  6 +-
 gr-filter/grc/filter_pfb_arb_resampler.xml         |  8 ++
 gr-filter/grc/filter_pfb_decimator.xml             |  8 ++
 gr-filter/grc/filter_pfb_interpolator.xml          |  8 ++
 gr-filter/include/gnuradio/filter/fft_filter.h     | 98 ++++++++++++++++++++--
 gr-filter/lib/pfb_arb_resampler_ccc_impl.cc        |  1 +
 gr-filter/lib/pfb_arb_resampler_ccf_impl.cc        |  1 +
 gr-filter/lib/pfb_arb_resampler_fff_impl.cc        |  1 +
 gr-filter/lib/pfb_channelizer_ccf_impl.cc          | 12 ++-
 gr-filter/python/filter/pfb.py                     | 15 +++-
 gr-filter/python/filter/qa_pfb_channelizer.py      | 21 ++++-
 gr-uhd/grc/gen_uhd_usrp_blocks.py                  |  1 +
 34 files changed, 869 insertions(+), 29 deletions(-)