[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 52a4e1fac2cc199171ef82ff4587aa8e9060ff86
Merge: 282b1c4 31e458f
Author: Johnathan Corgan <address@hidden>
Date:   Thu Jul 24 10:58:07 2014 -0700

    Merge branch 'master' into next

 cmake/Modules/GrBuildTypes.cmake                   |    6 +-
 gr-blocks/examples/matrix_multiplexer.grc          | 1110 ++++++++++++++++++++
 gr-blocks/grc/blocks_block_tree.xml                |    1 +
 gr-blocks/grc/blocks_multiply_matrix_xx.xml        |   68 ++
 gr-blocks/include/gnuradio/blocks/CMakeLists.txt   |    1 +
 .../include/gnuradio/blocks/multiply_matrix_XX.h.t |   94 ++
 gr-blocks/lib/CMakeLists.txt                       |    1 +
 gr-blocks/lib/multiply_matrix_cc_impl.cc           |  192 ++++
 gr-blocks/lib/multiply_matrix_cc_impl.h            |   59 ++
 gr-blocks/lib/multiply_matrix_ff_impl.cc           |  192 ++++
 gr-blocks/lib/multiply_matrix_ff_impl.h            |   59 ++
 gr-blocks/python/blocks/qa_multiply_matrix_ff.py   |  172 +++
 gr-blocks/swig/blocks_swig3.i                      |    3 +
 13 files changed, 1956 insertions(+), 2 deletions(-)