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

[git]

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

trondeau pushed a commit to branch next
in repository gnuradio.

commit 17aabfe78923eee7fe0f3837c4ffd35bdac44c83
Merge: 08e27c7 26169d2
Author: Tom Rondeau <address@hidden>
Date:   Wed Sep 24 19:26:10 2014 -0400

    Merge branch 'master' into next

 gnuradio-runtime/include/gnuradio/block.h          |  6 +-
 .../gnuradio/digital/ofdm_frame_equalizer_vcvc.h   | 17 ++---
 gr-digital/lib/header_payload_demux_impl.cc        | 71 ++++++++++---------
 gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc   | 66 ++++++++++--------
 gr-digital/lib/ofdm_serializer_vcc_impl.cc         | 80 +++++++++++-----------
 .../python/digital/qa_header_payload_demux.py      | 80 ++++++++++++++++++++++
 .../python/digital/qa_ofdm_frame_equalizer_vcvc.py |  2 +-
 gr-uhd/lib/usrp_sink_impl.cc                       | 15 +---
 8 files changed, 210 insertions(+), 127 deletions(-)