[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: |
Tue, 21 Jul 2015 19:27:57 +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 e83c495b3cb18e801ff5b69a1f451e799b71ca03
Merge: 85d46c7 cc973de
Author: Tom Rondeau <address@hidden>
Date: Tue Jul 21 15:22:35 2015 -0400
Merge branch 'master' into next
gr-digital/grc/digital_crc32_bb.xml | 16 +-
gr-digital/include/gnuradio/digital/crc32_bb.h | 2 +-
gr-digital/lib/crc32_bb_impl.cc | 103 +-
gr-digital/lib/crc32_bb_impl.h | 5 +-
gr-digital/python/digital/qa_crc32_bb.py | 130 ++
gr-fec/examples/ber_test.grc | 1500 +++++++++++---------
gr-fec/include/gnuradio/fec/CMakeLists.txt | 1 +
gr-fec/include/gnuradio/fec/dummy_encoder.h | 2 +-
gr-fec/lib/ber_bf_impl.cc | 83 +-
gr-fec/lib/ber_bf_impl.h | 3 +
gr-fec/lib/dummy_encoder_impl.cc | 22 +-
gr-fec/lib/dummy_encoder_impl.h | 6 +-
gr-fec/python/fec/extended_encoder.py | 3 +
gr-fec/python/fec/qa_ber_bf.py | 87 +-
gr-fec/python/fec/qa_fecapi_dummy.py | 49 +-
gr-qtgui/grc/qtgui_waterfall_sink_x.xml | 8 +
.../include/gnuradio/qtgui/WaterfallDisplayPlot.h | 4 +
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h | 1 +
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h | 1 +
.../include/gnuradio/qtgui/waterfalldisplayform.h | 2 +-
gr-qtgui/lib/WaterfallDisplayPlot.cc | 120 +-
gr-qtgui/lib/waterfall_sink_c_impl.cc | 168 ++-
gr-qtgui/lib/waterfall_sink_c_impl.h | 6 +
gr-qtgui/lib/waterfall_sink_f_impl.cc | 111 +-
gr-qtgui/lib/waterfall_sink_f_impl.h | 6 +
gr-qtgui/lib/waterfalldisplayform.cc | 5 +
26 files changed, 1569 insertions(+), 875 deletions(-)