[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into python3
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into python3 |
Date: |
Mon, 10 Apr 2017 15:42:59 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch python3
in repository gnuradio.
commit 45e7bacbd5f1be64323dfc02e8902bed7b0b5811
Merge: a82dcf4 b96a96e
Author: Johnathan Corgan <address@hidden>
Date: Mon Apr 10 08:31:55 2017 -0700
Merge branch 'next' into python3
...ml => digital_correlate_access_code_tag_xx.xml} | 23 +++-
gr-digital/include/gnuradio/digital/CMakeLists.txt | 1 +
.../digital/correlate_access_code_tag_ff.h | 72 +++++++++++
gr-digital/lib/CMakeLists.txt | 1 +
.../lib/correlate_access_code_tag_ff_impl.cc | 135 +++++++++++++++++++++
gr-digital/lib/correlate_access_code_tag_ff_impl.h | 61 ++++++++++
.../python/digital/qa_correlate_access_code.py | 20 ++-
.../python/digital/qa_correlate_access_code_tag.py | 38 +++++-
gr-digital/swig/digital_swig0.i | 3 +
9 files changed, 345 insertions(+), 9 deletions(-)
diff --cc gr-digital/python/digital/qa_correlate_access_code.py
index 1955dcf,0302e81..405147b
mode 100644,100755..100644
--- a/gr-digital/python/digital/qa_correlate_access_code.py
+++ b/gr-digital/python/digital/qa_correlate_access_code.py
diff --cc gr-digital/python/digital/qa_correlate_access_code_tag.py
index 4c70c61,378333c..be5848d
mode 100644,100755..100644
--- a/gr-digital/python/digital/qa_correlate_access_code_tag.py
+++ b/gr-digital/python/digital/qa_correlate_access_code_tag.py