[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'maint'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 32e0712b763a21c7cd750477a686228919e18492
Merge: b17bcb8 4ce1d49
Author: Johnathan Corgan <address@hidden>
Date:   Sun Jan 17 09:08:11 2016 -0800

    Merge branch 'maint'

 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 ++-
 gr-digital/lib/pfb_clock_sync_ccf_impl.cc          |  3 +
 gr-digital/lib/pfb_clock_sync_fff_impl.cc          |  3 +
 .../lib/rational_resampler_base_XXX_impl.cc.t      |  6 +-
 gr-uhd/grc/gen_uhd_usrp_blocks.py                  |  2 +-
 gr-utils/python/utils/plot_fft_base.py             |  2 +-
 grc/gui/ActionHandler.py                           | 10 +--
 11 files changed, 119 insertions(+), 86 deletions(-)