[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: |
Sun, 27 Dec 2015 21:43:04 +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 61195283697876d9fdbd0006132d310412912218
Merge: 0b2f7c4 7278728
Author: Johnathan Corgan <address@hidden>
Date: Sun Dec 27 13:35:01 2015 -0800
Merge branch 'master' into next
gnuradio-runtime/lib/buffer.cc | 4 +-
gr-blocks/grc/blocks_repeat.xml | 1 +
gr-blocks/include/gnuradio/blocks/repeat.h | 18 +++
gr-blocks/lib/repeat_impl.cc | 20 +++
gr-blocks/lib/repeat_impl.h | 6 +
gr-blocks/python/blocks/qa_delay.py | 23 +++
gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc | 178 +++++++++++-----------
gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.h | 21 ++-
8 files changed, 172 insertions(+), 99 deletions(-)