[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: |
Thu, 10 Apr 2014 19:38:27 +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 d903807908b95dcff5e5b1a9e6579ebf89abf7b8
Merge: a331b5e 4b55c7f
Author: Tom Rondeau <address@hidden>
Date: Thu Apr 10 15:38:15 2014 -0400
Merge branch 'master' into next
gnuradio-runtime/python/pmt/pmt_to_python.py | 64 +-
gnuradio-runtime/python/pmt/qa_pmt_to_python.py | 16 +-
gr-digital/examples/demod/test_corr_and_sync.grc | 1758 ++++++++++++++++----
.../include/gnuradio/digital/costas_loop_cc.h | 18 +-
.../include/gnuradio/digital/mpsk_receiver_cc.h | 35 +-
.../lib/correlate_access_code_tag_bb_impl.cc | 2 +-
gr-digital/lib/costas_loop_cc_impl.cc | 18 +-
gr-digital/lib/costas_loop_cc_impl.h | 10 +-
gr-digital/lib/mpsk_receiver_cc_impl.cc | 60 +-
gr-digital/lib/mpsk_receiver_cc_impl.h | 28 +-
gr-qtgui/grc/qtgui_const_sink_x.xml | 1058 ++----------
gr-qtgui/grc/qtgui_freq_sink_x.xml | 578 ++-----
gr-qtgui/grc/qtgui_histogram_sink_x.xml | 1063 ++----------
gr-qtgui/grc/qtgui_number_sink.xml | 233 +--
gr-qtgui/grc/qtgui_time_raster_x.xml | 237 +--
gr-qtgui/grc/qtgui_time_sink_x.xml | 1171 ++-----------
gr-qtgui/grc/qtgui_waterfall_sink_x.xml | 236 +--
grc/base/Block.py | 4 +-
grc/base/Param.py | 12 +-
grc/gui/Param.py | 69 +-
grc/python/Param.py | 44 -
grc/python/block.dtd | 3 +-
volk/lib/qa_utils.cc | 29 +-
23 files changed, 2321 insertions(+), 4425 deletions(-)