[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: |
Wed, 30 Jul 2014 23:17:21 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch next
in repository gnuradio.
commit 22a5a0236f4ccc41181cf49ee366ae1b0c5b1976
Merge: 027ace9 265e729
Author: Tom Rondeau <address@hidden>
Date: Wed Jul 30 19:17:00 2014 -0400
Merge branch 'master' into next
volk/kernels/volk/volk_32f_sqrt_32f.h | 2 ++
volk/kernels/volk/volk_32f_x2_dot_prod_32f.h | 2 ++
volk/kernels/volk/volk_32f_x2_min_32f.h | 2 ++
volk/kernels/volk/volk_32f_x2_multiply_32f.h | 4 +++-
volk/kernels/volk/volk_32f_x2_subtract_32f.h | 2 ++
volk/kernels/volk/volk_32f_x3_sum_of_poly_32f.h | 1 +
volk/kernels/volk/volk_32fc_magnitude_32f.h | 16 +++++++++-------
volk/kernels/volk/volk_32fc_x2_dot_prod_32fc.h | 19 ++++++++++---------
volk/kernels/volk/volk_32fc_x2_multiply_32fc.h | 12 +++++++-----
volk/kernels/volk/volk_8i_convert_16i.h | 4 +++-
volk/lib/CMakeLists.txt | 5 ++++-
11 files changed, 45 insertions(+), 24 deletions(-)