[Commit-gnuradio] [gnuradio] 02/03: Merge branch 'maint'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 9fd0f06d3c66c144517d52b1fdd47d7ad4416aac
Merge: 3d6dc9c 63bafe7
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jul 8 13:55:12 2014 -0700

    Merge branch 'maint'

 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-filter/lib/pfb_channelizer_ccf_impl.cc          |  4 ++++
 .../python/filter/qa_freq_xlating_fft_filter.py    |  2 +-
 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 ++++
 12 files changed, 55 insertions(+), 20 deletions(-)