[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 1e6a0dcdb925bd38cd6e67773e6c30c32e386fd3
Merge: aa98220 295ba35
Author: Tom Rondeau <address@hidden>
Date:   Tue Feb 11 16:10:54 2014 -0500

    Merge branch 'master' into next

 gr-filter/grc/filter_pfb_arb_resampler.xml         |   7 +
 gr-filter/include/gnuradio/filter/CMakeLists.txt   |   3 +-
 .../include/gnuradio/filter/pfb_arb_resampler.h    | 126 +++++
 .../gnuradio/filter/pfb_arb_resampler_ccc.h        | 132 +++++
 gr-filter/lib/CMakeLists.txt                       |  11 +-
 gr-filter/lib/fft_filter.cc                        |  92 ++--
 gr-filter/lib/pfb_arb_resampler.cc                 | 231 +++++++-
 gr-filter/lib/pfb_arb_resampler_ccc_impl.cc        | 183 +++++++
 gr-filter/lib/pfb_arb_resampler_ccc_impl.h         |  75 +++
 gr-filter/python/filter/pfb.py                     |  83 ++-
 gr-filter/python/filter/qa_pfb_arb_resampler.py    |  80 ++-
 gr-filter/swig/filter_swig.i                       |   3 +
 gr-qtgui/lib/sink_c_impl.cc                        |  30 +-
 gr-qtgui/lib/sink_f_impl.cc                        |  30 +-
 gr-qtgui/lib/spectrumdisplayform.cc                |  13 +-
 gr-uhd/apps/hf_explorer/README                     |  24 +-
 gr-uhd/apps/hf_explorer/hfx.py                     | 581 +++++++++------------
 17 files changed, 1248 insertions(+), 456 deletions(-)