[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'maint'

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit fa247a9f587651dedfa74ac2b56dc9c3e86a171e
Merge: ef6485c 6af7eb5
Author: Johnathan Corgan <address@hidden>
Date:   Sun May 10 20:02:23 2015 -0700

    Merge branch 'maint'

 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(-)