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

[git]

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

jcorgan pushed a commit to branch next
in repository gnuradio.

commit 965c4db3669cb4dfdc24cda8ccbc4a09c46d5ced
Merge: fa6813a efed1fe
Author: Johnathan Corgan <address@hidden>
Date:   Fri Feb 12 11:24:19 2016 -0800

    Merge branch 'master' into next

 gr-analog/lib/CMakeLists.txt                 | 11 -----------
 gr-analog/lib/frequency_modulator_fc_impl.cc | 22 ++++++++++++++++++++++
 gr-analog/lib/frequency_modulator_fc_impl.h  |  2 ++
 gr-blocks/lib/min_XX_impl.cc.t               |  4 ++--
 gr-uhd/apps/uhd_app.py                       | 22 ++++++++++++++++------
 gr-uhd/apps/uhd_rx_cfile                     | 11 ++++++++---
 6 files changed, 50 insertions(+), 22 deletions(-)