[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: |
Fri, 9 May 2014 22:28:45 +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 980669478a12667471366f7ddbe51fbf826f593b
Merge: af58303 432e3b7
Author: Johnathan Corgan <address@hidden>
Date: Fri May 9 14:31:40 2014 -0700
Merge branch 'master' into next
cmake/Modules/FindICE-3.5.cmake | 212 ++++++++++----------
cmake/Modules/FindICE.cmake | 221 ++++++++++-----------
gnuradio-runtime/include/gnuradio/block.h | 2 +-
gnuradio-runtime/include/pmt/pmt.h | 3 +
gnuradio-runtime/lib/pmt/pmt.cc | 13 ++
gnuradio-runtime/swig/pmt_swig.i | 1 +
.../grc/blocks_complex_to_interleaved_short.xml | 19 +-
.../gnuradio/blocks/complex_to_interleaved_short.h | 2 +-
gr-blocks/lib/complex_to_interleaved_short_impl.cc | 18 +-
gr-blocks/lib/complex_to_interleaved_short_impl.h | 4 +-
gr-digital/grc/digital_hdlc_deframer_bp.xml | 7 +-
.../include/gnuradio/digital/hdlc_deframer_bp.h | 11 +-
.../include/gnuradio/digital/hdlc_framer_pb.h | 2 +-
gr-digital/lib/hdlc_deframer_bp_impl.cc | 132 ++++++------
gr-digital/lib/hdlc_deframer_bp_impl.h | 16 +-
gr-digital/python/digital/qa_hdlc_framer.py | 5 +-
gr-filter/grc/CMakeLists.txt | 1 +
gr-filter/grc/filter_block_tree.xml | 1 +
.../grc/filter_freq_xlating_fft_filter_ccc.xml | 62 ++++++
gr-filter/python/filter/CMakeLists.txt | 1 +
gr-filter/python/filter/__init__.py | 1 +
gr-filter/python/filter/freq_xlating_fft_filter.py | 80 ++++++++
.../python/filter/qa_freq_xlating_fft_filter.py | 147 ++++++++++++++
grc/blocks/variable_function_probe.xml | 18 +-
24 files changed, 637 insertions(+), 342 deletions(-)