[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 099eb7201cd3c6391be123d763210df776757b9d
Merge: 2ddbd14 965c4db
Author: Johnathan Corgan <address@hidden>
Date:   Fri Feb 12 11:26:09 2016 -0800

    Merge branch 'next' into next-qt5

 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(-)