[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 d8353e17480ed6cc38c91eb27618a0b3c8e87b70
Merge: 099eb72 4aabba7
Author: Johnathan Corgan <address@hidden>
Date:   Sun Feb 14 08:31:41 2016 -0800

    Merge branch 'next' into next-qt5

 gr-channels/lib/fading_model_impl.cc                   | 11 -----------
 gr-channels/lib/flat_fader_impl.cc                     | 18 +++++++++---------
 gr-qtgui/grc/qtgui_freq_sink_x.xml                     | 17 +++++++++++++++++
 gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h |  3 +++
 gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h          |  1 +
 gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h          |  2 ++
 gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h      |  2 ++
 gr-qtgui/lib/FrequencyDisplayPlot.cc                   | 13 ++++++++++++-
 gr-qtgui/lib/freq_sink_c_impl.cc                       |  7 +++++++
 gr-qtgui/lib/freq_sink_c_impl.h                        |  1 +
 gr-qtgui/lib/freq_sink_f_impl.cc                       |  7 +++++++
 gr-qtgui/lib/freq_sink_f_impl.h                        |  1 +
 gr-qtgui/lib/freqdisplayform.cc                        |  6 ++++++
 gr-uhd/apps/uhd_rx_cfile                               |  2 +-
 14 files changed, 69 insertions(+), 22 deletions(-)