[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: |
Tue, 31 Mar 2015 14:51:22 +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 4a0fafe626be09f1a475c64772648ef17fb4e8fa
Merge: 0f87986 066003f
Author: Johnathan Corgan <address@hidden>
Date: Tue Mar 31 07:47:26 2015 -0700
Merge branch 'master' into next
gr-qtgui/grc/qtgui_time_sink_x.xml | 22 ++
gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt | 1 +
.../include/gnuradio/qtgui/TimeDomainDisplayPlot.h | 7 +
gr-qtgui/include/gnuradio/qtgui/displayform.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 | 81 ++++++
gr-qtgui/include/gnuradio/qtgui/timedisplayform.h | 32 ++-
gr-qtgui/lib/CMakeLists.txt | 2 +
gr-qtgui/lib/TimeDomainDisplayPlot.cc | 43 ++++
gr-qtgui/lib/displayform.cc | 10 +-
gr-qtgui/lib/time_sink_c_impl.cc | 66 +++--
gr-qtgui/lib/time_sink_c_impl.h | 2 +
gr-qtgui/lib/time_sink_f_impl.cc | 46 +++-
gr-qtgui/lib/time_sink_f_impl.h | 2 +
gr-qtgui/lib/timecontrolpanel.cc | 183 ++++++++++++++
gr-qtgui/lib/timedisplayform.cc | 276 ++++++++++++++++++++-
17 files changed, 729 insertions(+), 47 deletions(-)