[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'maint'
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'maint' |
Date: |
Thu, 4 Dec 2014 16:21:58 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch master
in repository gnuradio.
commit 8236ec001ecacc8580325209bb79fee622939926
Merge: b2e6c0f ec05c9b
Author: Tom Rondeau <address@hidden>
Date: Thu Dec 4 10:31:10 2014 -0500
Merge branch 'maint'
gnuradio-runtime/lib/math/fast_atan2f.cc | 18 +-
gnuradio-runtime/lib/math/qa_fast_atan2f.cc | 46 +-
gnuradio-runtime/python/gnuradio/gr/__init__.py | 12 +-
gr-analog/python/analog/qa_pll_carriertracking.py | 200 +-
gr-analog/python/analog/qa_pll_freqdet.py | 198 +-
gr-analog/python/analog/qa_pll_refout.py | 198 +-
gr-digital/examples/CMakeLists.txt | 3 +-
.../examples/demod/constellation_soft_decoder.grc | 2242 ++++++++++++++++++++
.../include/gnuradio/digital/constellation.h | 45 +-
gr-digital/lib/constellation.cc | 147 +-
.../lib/constellation_soft_decoder_cf_impl.cc | 8 +-
gr-digital/python/digital/qa_constellation.py | 107 +-
.../digital/qa_constellation_soft_decoder_cf.py | 155 +-
gr-digital/python/digital/qam_constellations.py | 2 +-
gr-digital/python/digital/soft_dec_lut_gen.py | 98 +-
.../filter/rational_resampler_base_XXX.h.t | 38 +
gr-filter/python/filter/rational_resampler.py | 43 +-
gr-qtgui/lib/TimeDomainDisplayPlot.cc | 8 +-
18 files changed, 3011 insertions(+), 557 deletions(-)