[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/02: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 02/02: Merge branch 'master' into next |
|
Date: |
Thu, 2 Apr 2015 19:15:54 +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 2d56b2261d5cfaacc51f6c2e651f9f45a10a5462
Merge: 50b6645 3061e47
Author: Johnathan Corgan <address@hidden>
Date: Thu Apr 2 12:11:22 2015 -0700
Merge branch 'master' into next
gr-dtv/lib/atsc/atsc_sync_impl.cc | 7 +
gr-dtv/lib/atsc/atsc_sync_impl.h | 7 -
gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc | 3828 ++++++++--------------
gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc | 59 +-
gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.h | 2 +-
gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc | 277 +-
gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.h | 2 +-
gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.cc | 12 +-
gr-dtv/lib/dvbt2/dvbt2_modulator_bc_impl.cc | 1104 +++----
gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc | 13 +-
gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc | 51 +-
gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc | 208 +-
gr-fec/lib/cc_decoder_impl.cc | 2 +-
gr-fec/lib/cc_decoder_impl.h | 1 -
gr-qtgui/lib/displayform.cc | 2 +-
15 files changed, 1869 insertions(+), 3706 deletions(-)