[Commit-gnuradio] [gnuradio] 03/03: Merge branch 'maint'

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit 7bf433f0226f8812fec0325fed9a6101e9c5ae43
Merge: c24c819 0ad9d3e
Author: Tom Rondeau <address@hidden>
Date:   Sat Nov 22 16:06:19 2014 -0500

    Merge branch 'maint'

 gr-qtgui/apps/gr_constellation_plot | 5 +----
 gr-qtgui/apps/gr_psd_plot_b         | 2 +-
 gr-qtgui/apps/gr_psd_plot_c         | 3 +--
 gr-qtgui/apps/gr_psd_plot_f         | 3 +--
 gr-qtgui/apps/gr_psd_plot_i         | 3 +--
 gr-qtgui/apps/gr_psd_plot_s         | 2 +-
 gr-qtgui/apps/gr_spectrogram_plot_b | 3 +--
 gr-qtgui/apps/gr_spectrogram_plot_c | 3 +--
 gr-qtgui/apps/gr_spectrogram_plot_f | 3 +--
 gr-qtgui/apps/gr_spectrogram_plot_i | 3 +--
 gr-qtgui/apps/gr_spectrogram_plot_s | 3 +--
 gr-qtgui/apps/gr_time_plot_b        | 2 +-
 gr-qtgui/apps/gr_time_plot_c        | 3 +--
 gr-qtgui/apps/gr_time_plot_f        | 2 +-
 gr-qtgui/apps/gr_time_plot_i        | 2 +-
 gr-qtgui/apps/gr_time_plot_s        | 2 +-
 gr-qtgui/apps/gr_time_raster_b      | 2 +-
 gr-qtgui/apps/gr_time_raster_f      | 2 +-
 gr-qtgui/lib/sink_c_impl.cc         | 6 +++---
 gr-qtgui/lib/sink_f_impl.cc         | 4 ++--
 20 files changed, 23 insertions(+), 35 deletions(-)