[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Mon, 31 Mar 2014 20:27:43 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit ea2f706b5593770c4789e4f2248f8bb2d64728d5
Merge: 0d6f848 a60337f
Author: Johnathan Corgan <address@hidden>
Date: Mon Mar 31 13:27:11 2014 -0700
Merge branch 'master' into next
gr-filter/examples/channelizer_demo.grc | 1265 ++++++++++++++++++++
gr-filter/grc/CMakeLists.txt | 2 +
gr-filter/grc/filter_block_tree.xml | 2 +
gr-filter/grc/filter_filterbank_vcvcf.xml | 29 +
gr-filter/grc/filter_pfb_channelizer_hier.xml | 80 ++
gr-filter/include/gnuradio/filter/CMakeLists.txt | 2 +
gr-filter/include/gnuradio/filter/filterbank.h | 97 ++
.../include/gnuradio/filter/filterbank_vcvcf.h | 76 ++
gr-filter/lib/CMakeLists.txt | 2 +
gr-filter/lib/filterbank.cc | 112 ++
gr-filter/lib/filterbank_vcvcf_impl.cc | 125 ++
gr-filter/lib/filterbank_vcvcf_impl.h | 57 +
gr-filter/python/filter/pfb.py | 83 +-
gr-filter/python/filter/qa_filterbank.py | 130 ++
gr-filter/python/filter/qa_pfb_channelizer.py | 144 ++-
gr-filter/swig/filter_swig.i | 5 +-
16 files changed, 2155 insertions(+), 56 deletions(-)