[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: |
Mon, 6 Apr 2015 06:03:46 +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 899761b431389b1fc910d0515581267ba8602f85
Merge: ae30e21 93c25bc
Author: Johnathan Corgan <address@hidden>
Date: Sun Apr 5 22:57:13 2015 -0700
Merge branch 'master' into next
gr-qtgui/grc/qtgui_const_sink_x.xml | 21 ++
gr-qtgui/grc/qtgui_freq_sink_x.xml | 38 +++
gr-qtgui/grc/qtgui_histogram_sink_x.xml | 21 ++
gr-qtgui/grc/qtgui_time_sink_x.xml | 55 +++-
gr-qtgui/grc/qtgui_waterfall_sink_x.xml | 21 ++
gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt | 1 +
gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h | 9 +
.../include/gnuradio/qtgui/FrequencyDisplayPlot.h | 14 +-
.../include/gnuradio/qtgui/WaterfallDisplayPlot.h | 4 +
gr-qtgui/include/gnuradio/qtgui/const_sink_c.h | 1 +
gr-qtgui/include/gnuradio/qtgui/displayform.h | 2 +
gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h | 4 +
gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h | 4 +
gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h | 107 +++++++
gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h | 37 ++-
gr-qtgui/include/gnuradio/qtgui/histogram_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/waterfall_sink_c.h | 1 +
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h | 1 +
gr-qtgui/lib/CMakeLists.txt | 2 +
gr-qtgui/lib/DisplayPlot.cc | 6 +
gr-qtgui/lib/FrequencyDisplayPlot.cc | 56 +++-
gr-qtgui/lib/WaterfallDisplayPlot.cc | 28 +-
gr-qtgui/lib/const_sink_c_impl.cc | 6 +
gr-qtgui/lib/const_sink_c_impl.h | 1 +
gr-qtgui/lib/displayform.cc | 6 +
gr-qtgui/lib/freq_sink_c_impl.cc | 27 ++
gr-qtgui/lib/freq_sink_c_impl.h | 4 +
gr-qtgui/lib/freq_sink_f_impl.cc | 27 ++
gr-qtgui/lib/freq_sink_f_impl.h | 4 +
gr-qtgui/lib/freqcontrolpanel.cc | 275 +++++++++++++++++
gr-qtgui/lib/freqdisplayform.cc | 331 ++++++++++++++++++++-
gr-qtgui/lib/histogram_sink_f_impl.cc | 6 +
gr-qtgui/lib/histogram_sink_f_impl.h | 1 +
gr-qtgui/lib/time_sink_c_impl.cc | 6 +
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/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 +
43 files changed, 1104 insertions(+), 48 deletions(-)