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

[git]

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

trondeau pushed a commit to branch next
in repository gnuradio.

commit b2912f1ed5998cdf43c4be822be102e81637d749
Merge: 721a6ba da122a9
Author: Tom Rondeau <address@hidden>
Date:   Sun Jan 4 15:45:09 2015 -0500

    Merge branch 'master' into next

 gr-qtgui/apps/CMakeLists.txt                       |   1 +
 gr-qtgui/apps/gr_spectrogram_plot                  | 206 +++++++++++++++++++++
 gr-qtgui/apps/plot_form.py                         |   1 +
 gr-qtgui/apps/plot_spectrogram_base.py             |   2 +
 gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h |   1 +
 gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h |   1 +
 .../include/gnuradio/qtgui/waterfalldisplayform.h  |   4 +
 gr-qtgui/lib/WaterfallDisplayPlot.cc               |   4 +-
 gr-qtgui/lib/waterfall_sink_c_impl.cc              |   6 +
 gr-qtgui/lib/waterfall_sink_c_impl.h               |   1 +
 gr-qtgui/lib/waterfall_sink_f_impl.cc              |   6 +
 gr-qtgui/lib/waterfall_sink_f_impl.h               |   1 +
 gr-qtgui/lib/waterfalldisplayform.cc               |  25 ++-
 13 files changed, 255 insertions(+), 4 deletions(-)