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

[git]

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

jcorgan pushed a commit to branch next
in repository gnuradio.

commit a84927af464f6c7513ef6d901a1490b69d4dda70
Merge: b34d537 6ea8c68
Author: Johnathan Corgan <address@hidden>
Date:   Mon Sep 7 18:34:22 2015 -0700

    Merge branch 'master' into next

 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(-)