[Commit-gnuradio] [gnuradio] 10/11: Merge remote-tracking branch 'tom/qtgui/time_auto_and_stop'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 4ed2622bf4f2a566dbcd22d78ac2e3ab528ceb33
Merge: ed4771a 18e9f92
Author: Johnathan Corgan <address@hidden>
Date:   Sun Apr 5 16:20:09 2015 -0700

    Merge remote-tracking branch 'tom/qtgui/time_auto_and_stop'

 .../include/gnuradio/qtgui/TimeDomainDisplayPlot.h |  2 ++
 gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h |  6 ++++-
 gr-qtgui/include/gnuradio/qtgui/timedisplayform.h  |  1 +
 gr-qtgui/lib/TimeDomainDisplayPlot.cc              | 13 +++++++++++
 gr-qtgui/lib/timecontrolpanel.cc                   | 27 ++++++++++++++++++----
 gr-qtgui/lib/timedisplayform.cc                    |  7 ++++++
 6 files changed, 51 insertions(+), 5 deletions(-)