[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, 29 Dec 2014 18:30:20 +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 90e83418c6fef12e1bc46f92386a517e3700df65
Merge: 66b4718 8c86d94
Author: Tom Rondeau <address@hidden>
Date: Mon Dec 29 13:28:22 2014 -0500
Merge branch 'master' into next
gr-blocks/grc/blocks_repack_bits_bb.xml | 27 +++-
gr-blocks/include/gnuradio/blocks/repack_bits_bb.h | 6 +-
gr-blocks/lib/repack_bits_bb_impl.cc | 115 +++++++++++-----
gr-blocks/lib/repack_bits_bb_impl.h | 5 +-
gr-blocks/python/blocks/qa_repack_bits_bb.py | 53 +++++++-
.../gnuradio/digital/correlate_access_code_bb_ts.h | 18 ++-
.../gnuradio/digital/correlate_access_code_ff_ts.h | 8 +-
gr-digital/lib/correlate_access_code_bb_ts_impl.cc | 151 ++++++++++++++-------
gr-digital/lib/correlate_access_code_bb_ts_impl.h | 19 ++-
gr-fec/include/gnuradio/fec/dummy_decoder.h | 1 +
gr-fec/lib/decoder_impl.cc | 6 -
gr-fec/lib/dummy_decoder_impl.cc | 10 +-
gr-fec/lib/dummy_decoder_impl.h | 1 -
gr-fec/lib/encoder_impl.cc | 9 --
14 files changed, 307 insertions(+), 122 deletions(-)