[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 04/05: Merge remote-tracking branch 'github
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 04/05: Merge remote-tracking branch 'github/rm-correlate-and-sync' into next |
|
Date: |
Thu, 8 Sep 2016 21:46:02 +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 8b55319c0c3a7bbce7b31af2380c3541657a244d
Merge: 60c1c7b 4b19157
Author: Johnathan Corgan <address@hidden>
Date: Thu Sep 8 14:28:18 2016 -0700
Merge remote-tracking branch 'github/rm-correlate-and-sync' into next
Conflicts:
gr-digital/grc/digital_correlate_and_sync_cc.xml
gr-digital/include/gnuradio/digital/correlate_and_sync_cc.h
gr-digital/examples/CMakeLists.txt | 3 -
gr-digital/examples/demod/test_corr_and_sync.grc | 3332 --------------------
gr-digital/examples/demod/uhd_corr_and_sync_rx.grc | 1677 ----------
gr-digital/examples/demod/uhd_corr_and_sync_tx.grc | 1619 ----------
gr-digital/grc/digital_correlate_and_sync_cc.xml | 37 -
gr-digital/include/gnuradio/digital/CMakeLists.txt | 1 -
.../gnuradio/digital/correlate_and_sync_cc.h | 90 -
gr-digital/lib/CMakeLists.txt | 1 -
gr-digital/lib/correlate_and_sync_cc_impl.cc | 172 -
gr-digital/lib/correlate_and_sync_cc_impl.h | 62 -
gr-digital/lib/modulate_vector.cc | 4 +-
gr-digital/python/digital/qa_correlate_and_sync.py | 104 -
gr-digital/swig/digital_swig.i | 3 -
13 files changed, 2 insertions(+), 7103 deletions(-)