[Commit-gnuradio] [gnuradio] 03/03: Merge remote-tracking branch 'daulpavid/freqsink_change'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 64f3b70cf135a8641a0271ee27b431e05a8df97b
Merge: b5418e2 311066b
Author: Johnathan Corgan <address@hidden>
Date:   Sun Feb 14 08:13:33 2016 -0800

    Merge remote-tracking branch 'daulpavid/freqsink_change'

 gr-qtgui/grc/qtgui_freq_sink_x.xml                     | 17 +++++++++++++++++
 gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h |  3 +++
 gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h          |  1 +
 gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h          |  2 ++
 gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h      |  2 ++
 gr-qtgui/lib/FrequencyDisplayPlot.cc                   | 13 ++++++++++++-
 gr-qtgui/lib/freq_sink_c_impl.cc                       |  7 +++++++
 gr-qtgui/lib/freq_sink_c_impl.h                        |  1 +
 gr-qtgui/lib/freq_sink_f_impl.cc                       |  7 +++++++
 gr-qtgui/lib/freq_sink_f_impl.h                        |  1 +
 gr-qtgui/lib/freqdisplayform.cc                        |  6 ++++++
 11 files changed, 59 insertions(+), 1 deletion(-)