[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 3369bebb0e174073656572d6c2394244488772f5
Merge: ebe2eed b20df75
Author: Tom Rondeau <address@hidden>
Date:   Thu May 1 19:03:47 2014 -0400

    Merge branch 'master' into next

 cmake/Modules/FindQwt.cmake                    |  2 +
 gr-digital/lib/hdlc_framer_pb_impl.cc          |  6 +-
 gr-filter/grc/filter_pfb_arb_resampler.xml     |  8 +++
 gr-filter/grc/filter_pfb_decimator.xml         |  8 +++
 gr-filter/grc/filter_pfb_interpolator.xml      |  8 +++
 gr-filter/include/gnuradio/filter/fft_filter.h | 98 ++++++++++++++++++++++++--
 gr-filter/lib/pfb_arb_resampler_ccc_impl.cc    |  1 +
 gr-filter/lib/pfb_arb_resampler_ccf_impl.cc    |  1 +
 gr-filter/lib/pfb_arb_resampler_fff_impl.cc    |  1 +
 gr-filter/python/filter/pfb.py                 | 15 +++-
 10 files changed, 137 insertions(+), 11 deletions(-)