[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 04/05: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 04/05: Merge branch 'master' into next |
|
Date: |
Sun, 14 Feb 2016 16:33:14 +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 46f3ee7c5e5a67405f91c45ba8fe63989fbcbfdb
Merge: 965c4db 64f3b70
Author: Johnathan Corgan <address@hidden>
Date: Sun Feb 14 08:25:18 2016 -0800
Merge branch 'master' into next
gr-qtgui/grc/qtgui_freq_sink_x.xml | 17 +++++++++++++++++
gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h | 3 +++
gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h | 1 +
gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h | 2 ++
gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h | 2 ++
gr-qtgui/lib/FrequencyDisplayPlot.cc | 13 ++++++++++++-
gr-qtgui/lib/freq_sink_c_impl.cc | 7 +++++++
gr-qtgui/lib/freq_sink_c_impl.h | 1 +
gr-qtgui/lib/freq_sink_f_impl.cc | 7 +++++++
gr-qtgui/lib/freq_sink_f_impl.h | 1 +
gr-qtgui/lib/freqdisplayform.cc | 6 ++++++
gr-uhd/apps/uhd_rx_cfile | 2 +-
12 files changed, 60 insertions(+), 2 deletions(-)