[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, 11 May 2015 03:09:24 +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 c77aca23d8098e1cc28db12f44661aa4aabc14ae
Merge: e0c25b2 fa247a9
Author: Johnathan Corgan <address@hidden>
Date: Sun May 10 20:03:09 2015 -0700
Merge branch 'master' into next
gr-digital/grc/digital_header_payload_demux.xml | 1 +
.../grc/digital_packet_headerparser_b_default.xml | 2 +-
.../include/gnuradio/qtgui/TimeDomainDisplayPlot.h | 16 +++++++
gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h | 3 ++
gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h | 4 ++
gr-qtgui/lib/TimeDomainDisplayPlot.cc | 50 +++++++++++++++++++++-
gr-qtgui/lib/freqcontrolpanel.cc | 8 ++++
gr-qtgui/lib/freqdisplayform.cc | 2 +
gr-qtgui/lib/timecontrolpanel.cc | 8 ++++
gr-qtgui/lib/timedisplayform.cc | 2 +
gr-qtgui/themes/alt.qss | 6 +++
gr-qtgui/themes/dark.qss | 8 +++-
12 files changed, 106 insertions(+), 4 deletions(-)