[Commit-gnuradio] [gnuradio] 08/08: Merge remote-tracking branch 'tom/qtgui/timedisplayform_qwt_fix'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 7fe6115297c9d5d1d9220dc23bab96aa88b2b72d
Merge: 89387b6 67e7004
Author: Johnathan Corgan <address@hidden>
Date:   Wed Apr 1 05:50:26 2015 -0700

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

 gr-qtgui/lib/timedisplayform.cc | 68 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)