[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next

[git]

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

trondeau pushed a commit to branch next
in repository gnuradio.

commit 386d3b09f2056865716a6ae04d4807aa32a27c73
Merge: 785bfe8 7bf433f
Author: Tom Rondeau <address@hidden>
Date:   Sat Nov 22 16:08:58 2014 -0500

    Merge branch 'master' into next

 gr-blocks/lib/udp_sink_impl.cc      | 5 ++---
 gr-blocks/lib/udp_source_impl.cc    | 3 +--
 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 ++--
 22 files changed, 26 insertions(+), 40 deletions(-)