[Commit-gnuradio] [gnuradio] 02/02: Merge remote-tracking branch 'mbr0wn/blocks/add_mmcc'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 6ea8c686549a8aa683456e9817c1aeb33d40a0c9
Merge: 25cc238 853dc0a
Author: Johnathan Corgan <address@hidden>
Date:   Mon Sep 7 18:22:27 2015 -0700

    Merge remote-tracking branch 'mbr0wn/blocks/add_mmcc'

 gr-blocks/lib/CMakeLists.txt                       |  3 +-
 gr-blocks/lib/multiply_matrix_cc_impl.cc           |  2 +-
 ...tiply_matrix_ff.py => qa_multiply_matrix_xx.py} | 48 +++++++++++++++++++---
 gr-blocks/swig/blocks_swig3.i                      |  3 ++
 4 files changed, 48 insertions(+), 8 deletions(-)