[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Sun, 16 Feb 2014 21:11:32 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch next
in repository gnuradio.
commit a41a1e1b4f326ad12864142575418f9ed848656a
Merge: 1e6a0dc cf8997c
Author: Tom Rondeau <address@hidden>
Date: Sun Feb 16 16:10:49 2014 -0500
Merge branch 'master' into next
cmake/Modules/FindQwt.cmake | 4 +-
gnuradio-runtime/gnuradio-runtime.conf.in | 2 +-
gnuradio-runtime/lib/logger.cc | 75 +--
gnuradio-runtime/lib/tpb_thread_body.cc | 41 +-
gnuradio-runtime/swig/gr_logger.i | 8 +-
gr-blocks/grc/blocks_message_strobe_random.xml | 69 +++
gr-blocks/grc/blocks_random_pdu.xml | 14 +-
gr-blocks/include/gnuradio/blocks/CMakeLists.txt | 1 +
.../gnuradio/blocks/message_strobe_random.h | 113 +++++
gr-blocks/include/gnuradio/blocks/random_pdu.h | 2 +-
gr-blocks/lib/CMakeLists.txt | 1 +
gr-blocks/lib/message_strobe_impl.cc | 2 +-
gr-blocks/lib/message_strobe_random_impl.cc | 121 +++++
gr-blocks/lib/message_strobe_random_impl.h | 73 +++
gr-blocks/lib/random_pdu_impl.cc | 19 +-
gr-blocks/lib/random_pdu_impl.h | 6 +-
gr-blocks/swig/blocks_swig0.i | 3 +
gr-digital/examples/ofdm/rx_ofdm.grc | 518 +++++++++++++--------
gr-digital/grc/digital_block_tree.xml | 1 -
gr-digital/grc/digital_bytes_to_syms.xml | 20 -
gr-digital/grc/digital_header_payload_demux.xml | 31 +-
.../gnuradio/digital/header_payload_demux.h | 24 +-
gr-digital/lib/header_payload_demux_impl.cc | 157 ++++++-
gr-digital/lib/header_payload_demux_impl.h | 38 +-
.../python/digital/qa_header_payload_demux.py | 71 ++-
gr-qtgui/lib/spectrumdisplayform.ui | 1 -
.../python/modtool/gr-newmod/lib/CMakeLists.txt | 6 +
.../python/modtool/gr-newmod/swig/CMakeLists.txt | 8 +
grc/grc.conf.in | 1 +
grc/gui/Messages.py | 2 +-
grc/python/Constants.py | 3 +
grc/python/Generator.py | 6 +-
volk/apps/volk_profile.cc | 212 +++++----
volk/lib/qa_utils.cc | 9 +-
volk/lib/qa_utils.h | 6 +-
35 files changed, 1246 insertions(+), 422 deletions(-)