[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: |
Wed, 24 Sep 2014 22:54:05 +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 08e27c7a76a9ec77b0a38ac7e2be9ac2159b4606
Merge: 1a9a550 84ca321
Author: Johnathan Corgan <address@hidden>
Date: Wed Sep 24 15:50:54 2014 -0700
Merge branch 'master' into next
docs/doxygen/Doxyfile.in | 27 +-
gnuradio-runtime/lib/buffer.cc | 5 +-
gr-blocks/examples/CMakeLists.txt | 8 +
gr-blocks/examples/vector_source_with_tags.grc | 614 +++++++++++++++++++++
gr-blocks/lib/deinterleave_impl.cc | 36 +-
gr-blocks/lib/deinterleave_impl.h | 3 +-
.../gnuradio/digital/clock_recovery_mm_ff.h | 2 +-
gr-digital/lib/clock_recovery_mm_cc_impl.cc | 48 +-
gr-digital/lib/clock_recovery_mm_cc_impl.h | 12 +-
gr-digital/lib/clock_recovery_mm_ff_impl.cc | 20 +-
gr-digital/lib/clock_recovery_mm_ff_impl.h | 12 +-
gr-digital/python/digital/qa_clock_recovery_mm.py | 44 +-
gr-fec/lib/decoder_impl.cc | 8 +-
gr-fec/lib/encoder_impl.cc | 12 +-
14 files changed, 763 insertions(+), 88 deletions(-)