[Commit-gnuradio] [gnuradio] 02/02: 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 5fd8738eae397739ebf9fa9518dc587b40b3464e
Merge: 60b85d7 13cf0ce
Author: Tom Rondeau <address@hidden>
Date:   Fri Mar 13 09:30:17 2015 -0400

    Merge branch 'maint'

 gr-analog/grc/analog_nbfm_rx.xml                   |  2 +-
 gr-analog/grc/analog_nbfm_tx.xml                   |  2 +-
 gr-analog/grc/analog_wfm_tx.xml                    |  2 +-
 .../include/gnuradio/blocks/multiply_matrix_XX.h.t |  3 +--
 gr-blocks/include/gnuradio/blocks/udp_source.h     |  4 ++--
 gr-blocks/lib/multiply_matrix_cc_impl.cc           |  3 +++
 gr-blocks/lib/multiply_matrix_ff_impl.cc           |  3 +++
 gr-blocks/lib/udp_source_impl.cc                   | 25 ++++++++++++----------
 gr-blocks/lib/udp_source_impl.h                    |  2 ++
 9 files changed, 28 insertions(+), 18 deletions(-)