[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 d57a138e335dd71c2b0264eb13e2e0fc84a7a541
Merge: 95ccf0b 889bad6
Author: Johnathan Corgan <address@hidden>
Date:   Sat Sep 17 08:30:38 2016 -0700

    Merge branch 'maint'

 gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h | 1 +
 gr-qtgui/lib/FrequencyDisplayPlot.cc               | 1 -
 gr-qtgui/lib/freqcontrolpanel.cc                   | 6 ++++++
 gr-qtgui/lib/freqdisplayform.cc                    | 3 +++
 4 files changed, 10 insertions(+), 1 deletion(-)