[Commit-gnuradio] [gnuradio] 10/16: Merge remote-tracking branch 'namccart/master' into master_waterfall_pdu

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit b49ccae9c7f487010772683c2ae0ff8b7da54e74
Merge: 9bf2199 6b605cb
Author: Tom Rondeau <address@hidden>
Date:   Mon Jul 20 16:37:45 2015 -0400

    Merge remote-tracking branch 'namccart/master' into master_waterfall_pdu

 gr-qtgui/grc/qtgui_waterfall_sink_x.xml            |   8 +
 .../include/gnuradio/qtgui/waterfalldisplayform.h  |   2 +-
 gr-qtgui/lib/WaterfallDisplayPlot.cc               | 105 +++++++-----
 gr-qtgui/lib/waterfall_sink_c_impl.cc              | 185 +++++++++++++++------
 gr-qtgui/lib/waterfall_sink_c_impl.h               |   5 +
 gr-qtgui/lib/waterfalldisplayform.cc               |   5 +
 6 files changed, 216 insertions(+), 94 deletions(-)