[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 404441f7d60c3cb36278dc1b99e2cdfafede4eb4
Merge: 80b48e1 e981cd8
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jul 8 14:09:23 2014 -0700

    Merge branch 'master' into next

 CMakeLists.txt                                     |  2 +-
 cmake/Modules/FindZeroMQ.cmake                     |  2 +-
 gnuradio-runtime/lib/block.cc                      |  2 +-
 gnuradio-runtime/lib/math/qa_fast_atan2f.cc        | 12 +++++++---
 gnuradio-runtime/lib/thread/thread.cc              | 26 +++++++++++++---------
 gnuradio-runtime/lib/tpb_thread_body.cc            |  5 +++++
 gr-fec/lib/ber_tools.cc                            | 11 +++++++++
 gr-filter/lib/pfb_channelizer_ccf_impl.cc          |  4 ++++
 .../python/filter/qa_freq_xlating_fft_filter.py    |  2 +-
 gr-qtgui/lib/ber_sink_b_impl.cc                    |  4 ++--
 gr-uhd/include/gnuradio/uhd/usrp_sink.h            |  4 +++-
 gr-uhd/include/gnuradio/uhd/usrp_source.h          |  4 +++-
 gr-uhd/swig/uhd_swig.i                             |  8 ++++++-
 gr-vocoder/lib/codec2/fdmdv.c                      |  4 ++++
 volk/kernels/volk/volk_8u_x4_conv_k7_r2_8u.h       |  4 ++++
 15 files changed, 72 insertions(+), 22 deletions(-)