[Commit-gnuradio] [gnuradio] 04/04: Merge remote-tracking branch 'martin/blocks/mult_matrix'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 31e458fe396ac2fcee49599c1aec588eaf0b060b
Merge: f44d08e 1e4ef3e
Author: Johnathan Corgan <address@hidden>
Date:   Thu Jul 24 10:13:44 2014 -0700

    Merge remote-tracking branch 'martin/blocks/mult_matrix'

 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 +
 12 files changed, 1952 insertions(+)