[Commit-gnuradio] [gnuradio] 07/07: Merge remote-tracking branch 'awalls/fm_emphasis_filter'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 5e383b0b6ef90cc555803856b82609dca6f8186a
Merge: 2b8e6a6 dd625eb
Author: Johnathan Corgan <address@hidden>
Date:   Wed Mar 30 22:43:24 2016 -0700

    Merge remote-tracking branch 'awalls/fm_emphasis_filter'

 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-filter/examples/synth_to_chan.py |   2 +-
 gr-uhd/examples/python/fm_tx4.py    |   3 +-
 10 files changed, 243 insertions(+), 56 deletions(-)