[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: |
Mon, 19 Sep 2016 14:10:14 +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 22924134e76d624ab59f1439a2998bc2e5882567
Merge: f7c8e9b 8223ae4
Author: Johnathan Corgan <address@hidden>
Date: Mon Sep 19 06:59:12 2016 -0700
Merge branch 'master' into next
gr-dtv/examples/vv003-cr23.grc | 6 +--
gr-dtv/examples/vv018-miso.grc | 6 +--
gr-dtv/grc/dtv_dvbt2_framemapper_cc.xml | 4 +-
gr-dtv/lib/atsc/atsc_sync_impl.cc | 42 +++++++++---------
gr-dtv/lib/atsc/atsc_sync_impl.h | 10 ++---
gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc | 50 ++++++++--------------
gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h | 1 +
gr-qtgui/lib/freqcontrolpanel.cc | 13 +++++-
gr-qtgui/lib/freqdisplayform.cc | 3 ++
gr-uhd/lib/CMakeLists.txt | 2 +-
gr-uhd/swig/CMakeLists.txt | 2 +-
11 files changed, 70 insertions(+), 69 deletions(-)