[Commit-gnuradio] [gnuradio] 04/04: Merge remote-tracking branch 'mbant/blocks/bug_742' into maint

[git]

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

trondeau pushed a commit to branch maint
in repository gnuradio.

commit 13cf0ce205bfc986e462591764cb7ca16e21346c
Merge: adb12aa 118f26a
Author: Tom Rondeau <address@hidden>
Date:   Fri Mar 13 09:26:43 2015 -0400

    Merge remote-tracking branch 'mbant/blocks/bug_742' into maint

 gr-blocks/include/gnuradio/blocks/multiply_matrix_XX.h.t | 3 +--
 gr-blocks/lib/multiply_matrix_cc_impl.cc                 | 3 +++
 gr-blocks/lib/multiply_matrix_ff_impl.cc                 | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)