|
| From: | git |
| Subject: | [Commit-gnuradio] [gnuradio] 06/06: Merge remote-tracking branch 'tom/qtgui/control_panel_stop' into maint |
| Date: | Mon, 11 May 2015 03:09:23 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch maint
in repository gnuradio.
commit 6af7eb5d2db7cecca4aa18b3d0959af630ec00da
Merge: f63a83a fa1cca4
Author: Johnathan Corgan <address@hidden>
Date: Sun May 10 20:00:47 2015 -0700
Merge remote-tracking branch 'tom/qtgui/control_panel_stop' into maint
gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h | 3 +++
gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h | 4 ++++
gr-qtgui/lib/freqcontrolpanel.cc | 8 ++++++++
gr-qtgui/lib/freqdisplayform.cc | 2 ++
gr-qtgui/lib/timecontrolpanel.cc | 8 ++++++++
gr-qtgui/lib/timedisplayform.cc | 2 ++
6 files changed, 27 insertions(+)
| [Prev in Thread] | Current Thread | [Next in Thread] |