[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: |
Tue, 14 Apr 2015 15:02:57 +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 be78ddac890210e480980f95b01ffe617c4dc714
Merge: 105096d c3bc71f
Author: Johnathan Corgan <address@hidden>
Date: Tue Apr 14 07:52:34 2015 -0700
Merge branch 'master' into next
docs/doxygen/Doxyfile.in | 33 +-
gnuradio-runtime/include/gnuradio/flowgraph.h | 2 +-
gnuradio-runtime/lib/flat_flowgraph.h | 2 +-
gr-digital/examples/CMakeLists.txt | 1 +
gr-digital/examples/demod/test_corr_est.grc | 3500 ++++++++++++++++++++
gr-digital/grc/digital_block_tree.xml | 4 +-
gr-digital/grc/digital_corr_est_cc.xml | 41 +
gr-digital/grc/digital_modulate_vector.xml | 34 +
gr-digital/include/gnuradio/digital/CMakeLists.txt | 4 +-
gr-digital/include/gnuradio/digital/corr_est_cc.h | 112 +
.../include/gnuradio/digital/modulate_vector.h | 70 +
gr-digital/lib/CMakeLists.txt | 2 +
gr-digital/lib/corr_est_cc_impl.cc | 282 ++
gr-digital/lib/corr_est_cc_impl.h | 64 +
gr-digital/lib/modulate_vector.cc | 70 +
gr-digital/swig/digital_swig.i | 7 +-
gr-fec/lib/tpc_encoder.cc | 144 +-
gr-filter/examples/CMakeLists.txt | 1 +
gr-filter/examples/filter_taps.grc | 1299 ++++++++
gr-filter/grc/CMakeLists.txt | 5 +
gr-filter/grc/filter_block_tree.xml | 8 +-
gr-filter/grc/variable_band_pass_filter_taps.xml | 97 +
gr-filter/grc/variable_band_reject_filter_taps.xml | 81 +
gr-filter/grc/variable_high_pass_filter_taps.xml | 75 +
gr-filter/grc/variable_low_pass_filter_taps.xml | 75 +
gr-filter/grc/variable_rrc_filter_taps.xml | 50 +
26 files changed, 5982 insertions(+), 81 deletions(-)