[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Fri, 30 Oct 2015 21:11:29 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 19f243540b88958bdf777a735e84d78ff9b10fa5
Merge: 4d38fe0 f8a84eb
Author: Johnathan Corgan <address@hidden>
Date: Fri Oct 30 13:58:39 2015 -0700
Merge branch 'master' into next
gnuradio-runtime/lib/logger.cc | 2 +-
gr-blocks/grc/blocks_block_tree.xml | 1 +
.../grc/blocks_complex_to_interleaved_char.xml | 37 +
.../gnuradio/blocks/complex_to_interleaved_char.h | 60 +
gr-blocks/lib/CMakeLists.txt | 1 +
gr-blocks/lib/complex_to_interleaved_char_impl.cc | 65 +
gr-blocks/lib/complex_to_interleaved_char_impl.h | 47 +
gr-blocks/python/blocks/qa_type_conversions.py | 10 +
gr-blocks/swig/blocks_swig2.i | 3 +
gr-qtgui/doc/qtgui.dox | 52 +
gr-qtgui/examples/CMakeLists.txt | 1 +
gr-qtgui/examples/qtgui_message_inputs.grc | 3641 ++++++++++++++++++++
gr-qtgui/grc/qtgui_const_sink_x.xml | 34 +-
gr-qtgui/grc/qtgui_freq_sink_x.xml | 50 +-
gr-qtgui/grc/qtgui_histogram_sink_x.xml | 34 +-
gr-qtgui/grc/qtgui_time_raster_x.xml | 39 +-
gr-qtgui/grc/qtgui_time_sink_x.xml | 45 +-
gr-qtgui/grc/qtgui_waterfall_sink_x.xml | 49 +-
.../include/gnuradio/qtgui/HistogramDisplayPlot.h | 3 +
gr-qtgui/include/gnuradio/qtgui/const_sink_c.h | 13 +-
gr-qtgui/include/gnuradio/qtgui/form_menus.h | 8 +-
gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h | 22 +-
gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h | 22 +-
gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h | 13 +-
.../include/gnuradio/qtgui/histogramdisplayform.h | 1 +
.../include/gnuradio/qtgui/spectrumUpdateEvents.h | 48 +
.../include/gnuradio/qtgui/time_raster_sink_b.h | 13 +-
.../include/gnuradio/qtgui/time_raster_sink_f.h | 12 +-
gr-qtgui/include/gnuradio/qtgui/time_sink_c.h | 13 +-
gr-qtgui/include/gnuradio/qtgui/time_sink_f.h | 13 +-
gr-qtgui/include/gnuradio/qtgui/timedisplayform.h | 1 +
.../include/gnuradio/qtgui/waterfallGlobalData.h | 3 +-
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h | 27 +-
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h | 23 +-
gr-qtgui/lib/HistogramDisplayPlot.cc | 26 +-
gr-qtgui/lib/TimeRasterDisplayPlot.cc | 4 +-
gr-qtgui/lib/WaterfallDisplayPlot.cc | 119 +-
gr-qtgui/lib/const_sink_c_impl.cc | 75 +-
gr-qtgui/lib/const_sink_c_impl.h | 5 +-
gr-qtgui/lib/freq_sink_c_impl.cc | 113 +-
gr-qtgui/lib/freq_sink_c_impl.h | 6 +-
gr-qtgui/lib/freq_sink_f_impl.cc | 112 +-
gr-qtgui/lib/freq_sink_f_impl.h | 6 +-
gr-qtgui/lib/freqdisplayform.cc | 12 +-
gr-qtgui/lib/histogram_sink_f_impl.cc | 89 +-
gr-qtgui/lib/histogram_sink_f_impl.h | 5 +-
gr-qtgui/lib/histogramdisplayform.cc | 13 +
gr-qtgui/lib/spectrumUpdateEvents.cc | 43 +
gr-qtgui/lib/time_raster_sink_b_impl.cc | 150 +-
gr-qtgui/lib/time_raster_sink_b_impl.h | 7 +-
gr-qtgui/lib/time_raster_sink_f_impl.cc | 135 +-
gr-qtgui/lib/time_raster_sink_f_impl.h | 7 +-
gr-qtgui/lib/time_sink_c_impl.cc | 68 +-
gr-qtgui/lib/time_sink_c_impl.h | 5 +-
gr-qtgui/lib/time_sink_f_impl.cc | 65 +-
gr-qtgui/lib/time_sink_f_impl.h | 5 +-
gr-qtgui/lib/timedisplayform.cc | 4 +-
gr-qtgui/lib/timerasterdisplayform.cc | 7 +
gr-qtgui/lib/waterfallGlobalData.cc | 10 +-
gr-qtgui/lib/waterfall_sink_c_impl.cc | 102 +-
gr-qtgui/lib/waterfall_sink_c_impl.h | 2 +-
gr-qtgui/lib/waterfall_sink_f_impl.cc | 97 +-
gr-qtgui/lib/waterfall_sink_f_impl.h | 2 +-
63 files changed, 5388 insertions(+), 312 deletions(-)