[Commit-gnuradio] [gnuradio] 07/07: Merge remote-tracking branch 'tom/qtgui/controlpanel'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 066003f85a86900199fa752d40420f01ef87afd6
Merge: 1ef31a4 8959d9a
Author: Johnathan Corgan <address@hidden>
Date:   Tue Mar 31 07:13:03 2015 -0700

    Merge remote-tracking branch 'tom/qtgui/controlpanel'
    
    Conflicts:
        volk

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