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

[git]

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

trondeau pushed a commit to branch next
in repository gnuradio.

commit a4103e046c4e94d477910615f5836dac8c820d73
Merge: c547a42 89f6843
Author: Tom Rondeau <address@hidden>
Date:   Wed Jul 30 13:47:49 2014 -0400

    Merge branch 'master' into next

 gr-blocks/grc/blocks_min_xx.xml                    |  58 +++++++
 gr-blocks/include/gnuradio/blocks/CMakeLists.txt   |  10 +-
 .../blocks/{multiply_const_cc.h => min_XX.h.t}     |  42 ++---
 .../include/gnuradio/blocks/multiply_const_cc.h    |   2 -
 .../{multiply_const_cc.h => multiply_const_vcc.h}  |  35 ++--
 .../{multiply_const_cc.h => multiply_const_vff.h}  |  35 ++--
 .../gnuradio/blocks/sub_ff.h}                      |  37 ++--
 gr-blocks/lib/CMakeLists.txt                       |  10 +-
 gr-blocks/lib/float_to_complex_impl.cc             |  15 +-
 gr-blocks/lib/min_XX_impl.cc.t                     |  80 +++++++++
 .../{multiply_const_cc_impl.h => min_XX_impl.h.t}  |  26 ++-
 gr-blocks/lib/multiply_const_cc_impl.cc            |   2 -
 gr-blocks/lib/multiply_const_cc_impl.h             |   2 -
 ..._complex_impl.cc => multiply_const_vcc_impl.cc} |  52 +++---
 ...y_const_cc_impl.h => multiply_const_vcc_impl.h} |  26 ++-
 ..._complex_impl.cc => multiply_const_vff_impl.cc} |  50 +++---
 ...y_const_cc_impl.h => multiply_const_vff_impl.h} |  26 ++-
 gr-blocks/lib/sub_ff_impl.cc                       |  82 +++++++++
 .../{multiply_const_cc_impl.h => sub_ff_impl.h}    |  23 +--
 gr-blocks/python/blocks/qa_max.py                  | 118 ++++++++++++-
 gr-blocks/python/blocks/qa_min.py                  | 178 ++++++++++++++++++++
 gr-blocks/swig/blocks_swig3.i                      |   9 +
 gr-digital/lib/binary_slicer_fb_impl.cc            |  16 +-
 gr-fec/lib/dummy_decoder_impl.cc                   |   1 +
 volk/apps/volk_profile.cc                          |   1 +
 .../asm/neon/volk_32f_s32f_multiply_32f_neonasm.s  |  17 +-
 volk/kernels/volk/volk_16i_x5_add_quad_16i_x4.h    |   5 +-
 volk/kernels/volk/volk_32f_binary_slicer_32i.h     |  10 +-
 volk/kernels/volk/volk_32f_binary_slicer_8i.h      | 187 +++++++++++++++++++++
 volk/kernels/volk/volk_32f_x3_sum_of_poly_32f.h    |  20 +--
 volk/lib/testqa.cc                                 |   1 +
 31 files changed, 916 insertions(+), 260 deletions(-)