[Commit-gnuradio] [gnuradio] 05/09: 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 b33345baedd0617df3ae70c8f0a374e1352a0527
Merge: c815a01 fc7861a
Author: Johnathan Corgan <address@hidden>
Date:   Wed Feb 4 12:11:42 2015 -0800

    Merge branch 'maint'

 gr-blocks/include/gnuradio/blocks/multiply_matrix_XX.h.t | 13 ++++++-------
 gr-qtgui/lib/SpectrumGUIClass.cc                         |  8 ++++----
 gr-qtgui/lib/freq_sink_c_impl.cc                         |  2 +-
 gr-qtgui/lib/freq_sink_f_impl.cc                         |  2 +-
 gr-qtgui/lib/waterfall_sink_c_impl.cc                    |  2 +-
 gr-qtgui/lib/waterfall_sink_f_impl.cc                    |  4 ++--
 6 files changed, 15 insertions(+), 16 deletions(-)