[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next

[git]

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

jcorgan pushed a commit to branch next
in repository gnuradio.

commit 22b01e3722fe8e7890ecb188f4ec6cfd3a5531c2
Merge: c38322b 5cb67ce
Author: Johnathan Corgan <address@hidden>
Date:   Fri May 23 10:31:28 2014 -0700

    Merge branch 'master' into next

 gnuradio-runtime/include/pmt/pmt_sugar.h           |  10 +-
 gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt |   1 +
 .../python/gnuradio/gr/packet_utils.py             |  32 ++--
 gnuradio-runtime/python/pmt/pmt_to_python.py       |   7 +-
 gr-analog/lib/agc3_cc_impl.cc                      |   2 +-
 gr-blocks/include/gnuradio/blocks/CMakeLists.txt   |   1 +
 .../include/gnuradio/blocks/tsb_vector_sink_X.h.t  |  63 ++++++++
 gr-blocks/lib/CMakeLists.txt                       |   1 +
 gr-blocks/lib/tsb_vector_sink_X_impl.cc.t          |  85 +++++++++++
 gr-blocks/lib/tsb_vector_sink_X_impl.h.t           |  58 ++++++++
 gr-blocks/python/blocks/qa_repack_bits_bb.py       |  57 +++-----
 gr-blocks/python/blocks/qa_tagged_stream_mux.py    | 123 +++++++---------
 gr-blocks/python/blocks/qa_tsb_vector_sink_X.py    |  58 ++++++++
 gr-blocks/swig/blocks_swig1.i                      |  15 ++
 gr-digital/python/digital/qa_crc32_bb.py           | 111 +++++++-------
 .../digital/qa_ofdm_carrier_allocator_cvc.py       | 111 ++++++--------
 gr-digital/python/digital/qa_ofdm_chanest_vcvc.py  |   7 +-
 .../python/digital/qa_ofdm_cyclic_prefixer.py      |  17 +--
 .../python/digital/qa_ofdm_frame_equalizer_vcvc.py | 162 ++++++++++-----------
 .../python/digital/qa_ofdm_serializer_vcc.py       | 120 +++++----------
 .../python/digital/qa_packet_headergenerator_bb.py | 105 ++++---------
 gr-digital/python/digital/utils/tagged_streams.py  |   2 +
 gr-uhd/grc/gen_uhd_usrp_blocks.py                  |  19 ++-
 23 files changed, 670 insertions(+), 497 deletions(-)