[Commit-gnuradio] [gnuradio] 04/05: Merge remote-tracking branch 'tom/qtgui/bug767' into maint

[git]

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

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit 7ccbd3356c2ad0b64ec363216d9eb766564811ba
Merge: ce73daf fce0657
Author: Johnathan Corgan <address@hidden>
Date:   Sat Mar 28 17:36:42 2015 -0700

    Merge remote-tracking branch 'tom/qtgui/bug767' into maint
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.

 gr-qtgui/lib/FrequencyDisplayPlot.cc | 3 +--
 gr-qtgui/lib/freq_sink_c_impl.cc     | 5 ++++-
 gr-qtgui/lib/freq_sink_f_impl.cc     | 5 ++++-
 3 files changed, 9 insertions(+), 4 deletions(-)