[Commit-gnuradio] [gnuradio] 04/05: Merge remote-tracking branch 'osh/qtgui_qss_fix'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 49d97afaa150682c3b5d285f7333581400ed04ad
Merge: 15a8a39 5fc448b
Author: Johnathan Corgan <address@hidden>
Date:   Mon Oct 17 07:29:10 2016 -0700

    Merge remote-tracking branch 'osh/qtgui_qss_fix'

 gr-qtgui/include/gnuradio/qtgui/utils.h        |  3 +++
 gr-qtgui/lib/const_sink_c_impl.cc              |  6 +-----
 gr-qtgui/lib/edit_box_msg_impl.cc              |  6 +-----
 gr-qtgui/lib/freq_sink_c_impl.cc               |  6 +-----
 gr-qtgui/lib/freq_sink_f_impl.cc               |  6 +-----
 gr-qtgui/lib/histogram_sink_f_impl.cc          |  6 +-----
 gr-qtgui/lib/qtgui_util.cc                     | 12 +++++++++++
 gr-qtgui/lib/sink_c_impl.cc                    |  6 +-----
 gr-qtgui/lib/sink_f_impl.cc                    |  6 +-----
 gr-qtgui/lib/time_raster_sink_b_impl.cc        |  6 +-----
 gr-qtgui/lib/time_raster_sink_f_impl.cc        |  6 +-----
 gr-qtgui/lib/time_sink_c_impl.cc               |  6 +-----
 gr-qtgui/lib/time_sink_f_impl.cc               |  6 +-----
 gr-qtgui/lib/vector_sink_f_impl.cc             |  6 +-----
 gr-qtgui/lib/waterfall_sink_c_impl.cc          |  6 +-----
 gr-qtgui/lib/waterfall_sink_f_impl.cc          |  6 +-----
 gr-qtgui/python/qtgui/CMakeLists.txt           |  1 +
 gr-qtgui/python/qtgui/__init__.py              |  1 +
 gr-qtgui/python/qtgui/range.py                 |  3 ++-
 gr-qtgui/python/qtgui/{__init__.py => util.py} | 28 ++++++++++++--------------
 grc/core/generator/flow_graph.tmpl             |  2 ++
 21 files changed, 48 insertions(+), 86 deletions(-)