[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Tue, 28 Jan 2014 20:11:01 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 451669cc645bf7cbfe4c58d4459e3dadee5fb3ed
Merge: 6f07f72 300f5fb
Author: Johnathan Corgan <address@hidden>
Date: Tue Jan 28 12:09:43 2014 -0800
Merge branch 'master' into next
gr-blocks/grc/blocks_block_tree.xml | 1 +
gr-blocks/grc/blocks_rotator_cc.xml | 27 ++++
gr-blocks/include/gnuradio/blocks/CMakeLists.txt | 1 +
gr-blocks/include/gnuradio/blocks/rotator.h | 2 +-
gr-blocks/include/gnuradio/blocks/rotator_cc.h | 54 ++++++++
gr-blocks/lib/CMakeLists.txt | 1 +
gr-blocks/lib/qa_rotator.cc | 44 ++++++
gr-blocks/lib/qa_rotator.h | 2 +
gr-blocks/lib/rotator_cc_impl.cc | 79 +++++++++++
gr-blocks/lib/rotator_cc_impl.h | 56 ++++++++
gr-blocks/swig/blocks_swig5.i | 3 +
volk/apps/volk_profile.cc | 4 +-
volk/kernels/volk/volk_32f_x3_sum_of_poly_32f.h | 147 +++++++++++++++++++++
.../volk/volk_32fc_s32fc_rotatorpuppet_32fc.h | 21 +--
.../kernels/volk/volk_32fc_s32fc_x2_rotator_32fc.h | 31 +++--
volk/lib/qa_utils.cc | 84 +++++++++++-
volk/lib/testqa.cc | 4 +-
17 files changed, 533 insertions(+), 28 deletions(-)