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

[git]

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

jcorgan pushed a commit to branch next
in repository gnuradio.

commit ea5e9f349ea5b6b557921eeda885c33e64a265f1
Merge: 87cce11 67aa043
Author: Johnathan Corgan <address@hidden>
Date:   Thu Jan 16 12:32:43 2014 -0800

    Merge branch 'master' into next

 gr-audio/lib/jack/jack_sink.cc                     | 111 ++++++++-----
 gr-audio/lib/jack/jack_sink.h                      |   6 +-
 gr-audio/lib/jack/jack_source.cc                   | 112 ++++++++-----
 gr-audio/lib/jack/jack_source.h                    |   6 +-
 .../grc/digital_packet_headergenerator_bb.xml      |   8 +-
 .../gnuradio/digital/ofdm_carrier_allocator_cvc.h  |   5 +
 gr-digital/lib/ofdm_carrier_allocator_cvc_impl.cc  |  14 +-
 gr-digital/lib/packet_headergenerator_bb_impl.cc   |   5 +-
 .../python/modtool/gr-newmod/lib/CMakeLists.txt    |   6 +
 volk/kernels/volk/volk_32f_invsqrt_32f.h           |  64 ++++++++
 volk/kernels/volk/volk_32fc_32f_dot_prod_32fc.h    | 179 ++++++++++++++++++++-
 volk/kernels/volk/volk_32fc_32f_multiply_32fc.h    |  61 ++++++-
 12 files changed, 476 insertions(+), 101 deletions(-)