[Commit-gnuradio] [gnuradio] 07/11: Merge remote-tracking branch 'tom/nbfm' into maint

[git]

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

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit 4ece7cfa9b0f090a2e30d1b5dc4770c64a392546
Merge: f44e66c 688ca0d
Author: Johnathan Corgan <address@hidden>
Date:   Sun Jan 17 08:51:57 2016 -0800

    Merge remote-tracking branch 'tom/nbfm' into maint
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.

 gnuradio-runtime/python/gnuradio/gru/freqz.py |  2 +-
 gr-analog/grc/analog_nbfm_rx.xml              | 80 +++++++++++++++------------
 gr-analog/grc/analog_nbfm_tx.xml              | 80 +++++++++++++++------------
 gr-analog/python/analog/nbfm_rx.py            |  8 ++-
 gr-analog/python/analog/nbfm_tx.py            |  9 ++-
 5 files changed, 102 insertions(+), 77 deletions(-)