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

[git]

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

trondeau pushed a commit to branch next
in repository gnuradio.

commit 3391fa634679b6de84d454ed34e4d21458a59b26
Merge: ea5e9f3 213f244
Author: Tom Rondeau <address@hidden>
Date:   Sat Jan 18 15:31:23 2014 -0500

    Merge branch 'master' into next

 gnuradio-runtime/lib/thread/thread.cc        |   1 +
 gr-filter/lib/fft_filter.cc                  |  16 ++-
 gr-filter/lib/fir_filter.cc                  |  60 ++++-----
 gr-filter/lib/fir_filter_with_buffer.cc      |  49 ++++----
 gr-filter/lib/qa_fir_filter_with_buffer.cc   |  64 +++++-----
 gr-filter/lib/qa_mmse_fir_interpolator_cc.cc |   6 +-
 gr-filter/lib/qa_mmse_fir_interpolator_ff.cc |   5 +-
 gr-qtgui/lib/const_sink_c_impl.cc            |  20 +--
 gr-qtgui/lib/freq_sink_c_impl.cc             |  30 +++--
 gr-qtgui/lib/freq_sink_f_impl.cc             |  30 +++--
 gr-qtgui/lib/histogram_sink_f_impl.cc        |  10 +-
 gr-qtgui/lib/time_raster_sink_b_impl.cc      |  20 +--
 gr-qtgui/lib/time_raster_sink_f_impl.cc      |  20 +--
 gr-qtgui/lib/time_sink_c_impl.cc             |  10 +-
 gr-qtgui/lib/time_sink_f_impl.cc             |  10 +-
 gr-qtgui/lib/waterfall_sink_c_impl.cc        |  30 +++--
 gr-qtgui/lib/waterfall_sink_f_impl.cc        |  30 +++--
 volk/CMakeLists.txt                          |   1 +
 volk/include/volk/volk_malloc.h              |  66 ++++++++++
 volk/lib/CMakeLists.txt                      |   1 +
 volk/lib/volk_malloc.c                       | 176 +++++++++++++++++++++++++++
 volk/tmpl/volk.tmpl.h                        |   1 +
 22 files changed, 480 insertions(+), 176 deletions(-)