[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: |
Sun, 27 Nov 2016 22:41:16 +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 521729b2ccb483cbccf83fb23ffbdecbb68ad8df
Merge: e28e7d0 db1a0a9
Author: Johnathan Corgan <address@hidden>
Date: Sun Nov 27 14:38:38 2016 -0800
Merge branch 'master' into next
gr-dtv/lib/dvb/dvb_bbheader_bb_impl.cc | 2 +-
gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.cc | 3 +--
gr-dtv/lib/dvb/dvb_bch_bb_impl.cc | 2 +-
gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc | 8 ++++----
gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc | 1 +
gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc | 1 +
gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc | 2 ++
gr-dtv/lib/dvbt2/dvbt2_modulator_bc_impl.cc | 2 +-
gr-utils/python/modtool/gr-newmod/CMakeLists.txt | 17 +++++++++++++++++
grc/core/Block.py | 5 ++++-
grc/core/utils/epy_block_io.py | 8 ++++----
11 files changed, 37 insertions(+), 14 deletions(-)