[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5 |
|
Date: |
Sun, 21 Feb 2016 15:39:15 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next-qt5
in repository gnuradio.
commit 55112c5e1c41b049499df75ce829606d90e54d83
Merge: d8353e1 e34866d
Author: Johnathan Corgan <address@hidden>
Date: Sun Feb 21 07:37:38 2016 -0800
Merge branch 'next' into next-qt5
cmake/Modules/GrVersion.cmake | 8 ++++++-
gr-blocks/lib/tagged_stream_align_impl.cc | 1 +
gr-fec/include/gnuradio/fec/polar_decoder_common.h | 6 ++++-
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 +
.../include/gnuradio/qtgui/time_raster_sink_b.h | 1 +
.../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 | 10 ++++++--
gr-qtgui/lib/time_sink_c_impl.h | 1 +
gr-qtgui/lib/time_sink_f_impl.cc | 8 ++++++-
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 +
gr-uhd/apps/uhd_rx_cfile | 27 +++++++++++-----------
gr-utils/python/modtool/modtool_add.py | 14 +++++++----
gr-utils/python/modtool/templates.py | 3 +--
grc/gui/FlowGraph.py | 4 ++++
53 files changed, 274 insertions(+), 27 deletions(-)