[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/03: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/03: Merge branch 'master' into next |
|
Date: |
Tue, 15 Nov 2016 19:18:50 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 0afe21da4895d44533a2effcaf79e5d9e12c72f6
Merge: cfb2c30 edd0253
Author: Johnathan Corgan <address@hidden>
Date: Tue Nov 15 11:02:42 2016 -0800
Merge branch 'master' into next
gr-digital/grc/digital_ofdm_demod.xml | 1 +
gr-digital/grc/digital_ofdm_frame_acquisition.xml | 1 +
gr-digital/grc/digital_ofdm_frame_sink.xml | 1 +
gr-digital/grc/digital_ofdm_insert_preamble.xml | 1 +
gr-digital/grc/digital_ofdm_mod.xml | 1 +
gr-digital/grc/digital_ofdm_sampler.xml | 1 +
gr-digital/grc/digital_ofdm_sync_pn.xml | 1 +
.../gnuradio/digital/ofdm_frame_acquisition.h | 1 +
.../include/gnuradio/digital/ofdm_frame_sink.h | 1 +
.../gnuradio/digital/ofdm_insert_preamble.h | 1 +
.../include/gnuradio/digital/ofdm_mapper_bcv.h | 1 +
gr-digital/include/gnuradio/digital/ofdm_sampler.h | 1 +
gr-digital/lib/ofdm_frame_acquisition_impl.cc | 32 +++++----
gr-digital/lib/ofdm_frame_sink_impl.cc | 84 +++++++++++-----------
gr-digital/lib/ofdm_insert_preamble_impl.cc | 18 ++---
gr-digital/lib/ofdm_mapper_bcv_impl.cc | 52 +++++++-------
gr-digital/lib/ofdm_sampler_impl.cc | 24 ++++---
17 files changed, 122 insertions(+), 100 deletions(-)