[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'master' into next |
|
Date: |
Thu, 23 Oct 2014 22:03:23 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch next
in repository gnuradio.
commit 14aaadcfa6defbd8d1439b98c09dc99b2d35be9e
Merge: 259b3e9 6f1913b
Author: Tom Rondeau <address@hidden>
Date: Thu Oct 23 18:01:43 2014 -0400
Merge branch 'master' into next
gr-qtgui/grc/qtgui_freq_sink_x.xml | 81 +++++++
gr-qtgui/grc/qtgui_waterfall_sink_x.xml | 19 ++
.../include/gnuradio/qtgui/FrequencyDisplayPlot.h | 3 +
.../include/gnuradio/qtgui/WaterfallDisplayPlot.h | 2 +
gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h | 28 +++
gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h | 35 +++
gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h | 28 +++
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h | 7 +
.../include/gnuradio/qtgui/waterfalldisplayform.h | 1 +
gr-qtgui/lib/FrequencyDisplayPlot.cc | 34 ++-
gr-qtgui/lib/WaterfallDisplayPlot.cc | 31 ++-
gr-qtgui/lib/const_sink_c_impl.cc | 2 +-
gr-qtgui/lib/freq_sink_c_impl.cc | 247 +++++++++++++++------
gr-qtgui/lib/freq_sink_c_impl.h | 25 ++-
gr-qtgui/lib/freq_sink_f_impl.cc | 243 ++++++++++++++------
gr-qtgui/lib/freq_sink_f_impl.h | 28 ++-
gr-qtgui/lib/freqdisplayform.cc | 119 ++++++++++
gr-qtgui/lib/waterfall_sink_f_impl.cc | 23 +-
gr-qtgui/lib/waterfall_sink_f_impl.h | 1 +
gr-qtgui/lib/waterfalldisplayform.cc | 7 +
20 files changed, 796 insertions(+), 168 deletions(-)