[Commit-gnuradio] [gnuradio] 08/10: Merge remote-tracking branch 'osh/qtgui_axislabels_onoff'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 051dc151d58ecdd2480f49c76c7c05edb944f1f4
Merge: 9cbafd7 9730af3
Author: Johnathan Corgan <address@hidden>
Date:   Sun Feb 21 07:21:22 2016 -0800

    Merge remote-tracking branch 'osh/qtgui_axislabels_onoff'

 gr-qtgui/grc/qtgui_const_sink_x.xml                  | 18 ++++++++++++++++++
 gr-qtgui/grc/qtgui_freq_sink_x.xml                   | 18 ++++++++++++++++++
 gr-qtgui/grc/qtgui_histogram_sink_x.xml              | 18 ++++++++++++++++++
 gr-qtgui/grc/qtgui_time_raster_x.xml                 | 17 +++++++++++++++++
 gr-qtgui/grc/qtgui_time_sink_x.xml                   | 18 ++++++++++++++++++
 gr-qtgui/grc/qtgui_waterfall_sink_x.xml              | 18 ++++++++++++++++++
 gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h        |  1 +
 gr-qtgui/include/gnuradio/qtgui/const_sink_c.h       |  1 +
 gr-qtgui/include/gnuradio/qtgui/displayform.h        |  3 +++
 gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h        |  1 +
 gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h        |  1 +
 gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h   |  1 +
 gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h    |  1 -
 gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h   |  1 +
 gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h |  1 +
 gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h |  1 +
 gr-qtgui/include/gnuradio/qtgui/time_sink_c.h        |  1 +
 gr-qtgui/include/gnuradio/qtgui/time_sink_f.h        |  1 +
 gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h   |  2 ++
 gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h   |  1 +
 gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h   |  1 +
 gr-qtgui/lib/DisplayPlot.cc                          |  9 +++++++++
 gr-qtgui/lib/WaterfallDisplayPlot.cc                 |  2 --
 gr-qtgui/lib/const_sink_c_impl.cc                    |  6 ++++++
 gr-qtgui/lib/const_sink_c_impl.h                     |  1 +
 gr-qtgui/lib/displayform.cc                          | 16 ++++++++++++++++
 gr-qtgui/lib/freq_sink_c_impl.cc                     |  6 ++++++
 gr-qtgui/lib/freq_sink_c_impl.h                      |  1 +
 gr-qtgui/lib/freq_sink_f_impl.cc                     |  6 ++++++
 gr-qtgui/lib/freq_sink_f_impl.h                      |  1 +
 gr-qtgui/lib/freqcontrolpanel.cc                     |  5 +++++
 gr-qtgui/lib/histogram_sink_f_impl.cc                |  6 ++++++
 gr-qtgui/lib/histogram_sink_f_impl.h                 |  1 +
 gr-qtgui/lib/time_raster_sink_b_impl.cc              |  6 ++++++
 gr-qtgui/lib/time_raster_sink_b_impl.h               |  1 +
 gr-qtgui/lib/time_raster_sink_f_impl.cc              |  6 ++++++
 gr-qtgui/lib/time_raster_sink_f_impl.h               |  1 +
 gr-qtgui/lib/time_sink_c_impl.cc                     |  8 +++++++-
 gr-qtgui/lib/time_sink_c_impl.h                      |  1 +
 gr-qtgui/lib/time_sink_f_impl.cc                     |  6 ++++++
 gr-qtgui/lib/time_sink_f_impl.h                      |  1 +
 gr-qtgui/lib/timecontrolpanel.cc                     |  5 +++++
 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 +
 46 files changed, 230 insertions(+), 4 deletions(-)