[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gnuradio-commit
Subject:    [Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
From:       git () gnuradio ! org
Date:       2014-10-31 19:22:32
Message-ID: 20141031192232.988181A82A3 () hertz ! gnuradio ! org
[Download RAW message or body]

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

jcorgan pushed a commit to branch next
in repository gnuradio.

commit 89d0241b0ee940cb499fbcdc91ff559b9919eecd
Merge: 8462022 4869607
Author: Johnathan Corgan <johnathan@corganlabs.com>
Date:   Fri Oct 31 12:16:16 2014 -0700

    Merge branch 'master' into next

 volk/apps/volk_profile.cc                          |  14 +--
 volk/kernels/volk/volk_16i_32fc_dot_prod_32fc.h    |  48 +++++++++-
 volk/kernels/volk/volk_16i_convert_8i.h            |  43 ++++++++-
 volk/kernels/volk/volk_16i_s32f_convert_32f.h      |  46 ++++++++++
 volk/kernels/volk/volk_16u_byteswap.h              |  52 +++++++++++
 volk/kernels/volk/volk_16u_byteswappuppet_16u.h    |  55 +++++++++++
 volk/kernels/volk/volk_32f_binary_slicer_8i.h      |  80 ++++++++++++++++
 volk/kernels/volk/volk_32f_log2_32f.h              | 102 ++++++++++++++++++++-
 volk/kernels/volk/volk_32f_x2_pow_32f.h            |   0
 volk/kernels/volk/volk_32fc_deinterleave_32f_x2.h  |  33 +++++++
 .../kernels/volk/volk_32fc_deinterleave_imag_32f.h |  29 ++++++
 .../kernels/volk/volk_32fc_deinterleave_real_32f.h |  26 ++++++
 volk/kernels/volk/volk_32fc_s32fc_multiply_32fc.h  |  41 ++++++++-
 .../volk/volk_32fc_x2_conjugate_dot_prod_32fc.h    |  49 +++++++++-
 volk/kernels/volk/volk_32fc_x2_dot_prod_32fc.h     |   2 +-
 volk/kernels/volk/volk_32i_x2_and_32i.h            |  34 +++++++
 volk/kernels/volk/volk_32i_x2_or_32i.h             |  34 +++++++
 volk/kernels/volk/volk_32u_byteswap.h              |  55 ++++++++++-
 volk/kernels/volk/volk_32u_byteswappuppet_32u.h    |  45 +++++++++
 volk/kernels/volk/volk_32u_popcntpuppet_32u.h      |  47 ++++++++++
 volk/kernels/volk/volk_64u_byteswap.h              |  55 +++++++++++
 volk/kernels/volk/volk_64u_byteswappuppet_64u.h    |  45 +++++++++
 volk/kernels/volk/volk_64u_popcnt.h                |  20 ++++
 volk/kernels/volk/volk_64u_popcntpuppet_64u.h      |  48 ++++++++++
 volk/lib/qa_utils.cc                               |   2 +-
 volk/lib/testqa.cc                                 |   6 +-
 26 files changed, 987 insertions(+), 24 deletions(-)

_______________________________________________
Commit-gnuradio mailing list
Commit-gnuradio@gnu.org
https://lists.gnu.org/mailman/listinfo/commit-gnuradio
[prev in list] [next in list] [prev in thread] [next in thread]