[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch next-qt5
in repository gnuradio.

commit 358d303e8a2ce115c2171c000d9b3eb548547218
Merge: b4b63bd 6ac74a2
Author: Johnathan Corgan <address@hidden>
Date:   Wed Mar 30 22:47:39 2016 -0700

    Merge branch 'next' into next-qt5

 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 +
 volk                                               |   2 +-
 17 files changed, 254 insertions(+), 63 deletions(-)