[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: |
Fri, 7 Mar 2014 00:24:13 +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 6c8d0d26fb3c6f74dbceead8f68aa340ab8d7ade
Merge: 7f92fd4 ca69ec5
Author: Tom Rondeau <address@hidden>
Date: Thu Mar 6 19:23:13 2014 -0500
Merge branch 'master' into next
gnuradio-runtime/swig/block.i | 4 +-
gr-digital/examples/berawgn.py | 11 +--
gr-digital/examples/example_costas.py | 15 ++--
gr-digital/examples/example_fll.py | 15 ++--
gr-digital/examples/example_timing.py | 21 +++---
gr-digital/lib/fll_band_edge_cc_impl.cc | 43 ++++-------
gr-digital/lib/fll_band_edge_cc_impl.h | 20 +++--
volk/apps/volk_profile.cc | 58 +++++++++------
volk/kernels/volk/volk_16i_32fc_dot_prod_32fc.h | 90 ++++++++++++++++++++++-
volk/kernels/volk/volk_32f_x2_dot_prod_16i.h | 75 ++++++++++++++++++-
volk/kernels/volk/volk_32fc_32f_dot_prod_32fc.h | 76 +++++++++++++++++++
volk/python/volk_modtool/volk_modtool_generate.py | 24 +++++-
12 files changed, 354 insertions(+), 98 deletions(-)