[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, 25 Sep 2015 15:39:01 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch next
in repository gnuradio.
commit 779fb8fdb5bb2950efcf2a8befcb6733cb6d839d
Merge: 30b5623 222e000
Author: Tom Rondeau <address@hidden>
Date: Fri Sep 25 11:33:04 2015 -0400
Merge branch 'master' into next
gr-fec/examples/fecapi_async_decoders.grc | 79 +-
gr-fec/examples/fecapi_async_encoders.grc | 32 +-
gr-fec/examples/fecapi_tagged_decoders.grc | 1941 ++++++++++++++------------
gr-fec/grc/fec_async_decoder.xml | 9 +-
gr-fec/grc/fec_async_encoder.xml | 9 +-
gr-fec/grc/fec_extended_tagged_decoder.xml | 9 +-
gr-fec/grc/fec_extended_tagged_encoder.xml | 9 +-
gr-fec/grc/fec_tagged_decoder.xml | 9 +-
gr-fec/grc/fec_tagged_encoder.xml | 9 +-
gr-fec/include/gnuradio/fec/async_decoder.h | 6 +-
gr-fec/include/gnuradio/fec/async_encoder.h | 6 +-
gr-fec/include/gnuradio/fec/tagged_decoder.h | 6 +-
gr-fec/include/gnuradio/fec/tagged_encoder.h | 6 +-
gr-fec/lib/async_decoder_impl.cc | 46 +-
gr-fec/lib/async_decoder_impl.h | 4 +-
gr-fec/lib/async_encoder_impl.cc | 21 +-
gr-fec/lib/async_encoder_impl.h | 4 +-
gr-fec/lib/tagged_decoder_impl.cc | 21 +-
gr-fec/lib/tagged_decoder_impl.h | 4 +-
gr-fec/lib/tagged_encoder_impl.cc | 20 +-
gr-fec/lib/tagged_encoder_impl.h | 4 +-
gr-fec/python/fec/extended_tagged_decoder.py | 5 +-
gr-fec/python/fec/extended_tagged_encoder.py | 4 +-
23 files changed, 1273 insertions(+), 990 deletions(-)