[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, 31 Mar 2016 05:49:53 +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 6ac74a242c12b7e759403176c757b3042a67d0d1
Merge: 3ac8785 5e383b0
Author: Johnathan Corgan <address@hidden>
Date: Wed Mar 30 22:45:25 2016 -0700
Merge branch 'master' into next
docs/exploring-gnuradio/fm_tx.grc | 4 +
gr-analog/examples/fmtest.py | 3 +-
gr-analog/grc/analog_fm_preemph.xml | 8 +-
gr-analog/grc/analog_nbfm_tx.xml | 8 +
gr-analog/grc/analog_wfm_tx.xml | 7 +
gr-analog/python/analog/fm_emph.py | 254 +++++++++++++++++----
gr-analog/python/analog/nbfm_tx.py | 5 +-
gr-analog/python/analog/wfm_tx.py | 5 +-
gr-blocks/include/gnuradio/blocks/head.h | 2 +-
gr-blocks/lib/head_impl.h | 2 +-
gr-digital/lib/correlate_access_code_bb_ts_impl.cc | 4 +-
gr-digital/lib/correlate_access_code_ff_ts_impl.cc | 4 +-
gr-filter/examples/synth_to_chan.py | 2 +-
gr-uhd/examples/python/fm_tx4.py | 3 +-
gr-utils/python/modtool/gr-newmod/CMakeLists.txt | 1 +
.../gr-newmod/cmake/Modules/GrMiscUtils.cmake | 3 +
16 files changed, 253 insertions(+), 62 deletions(-)