[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 05/05: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 05/05: Merge branch 'master' into next |
|
Date: |
Mon, 27 Mar 2017 21:26:31 +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 c01ac41eed33130521812f88005b6b7123ae24dc
Merge: 5b2d034 1d477a7
Author: Johnathan Corgan <address@hidden>
Date: Mon Mar 27 14:19:59 2017 -0700
Merge branch 'master' into next
gr-blocks/grc/blocks_block_tree.xml | 1 +
gr-blocks/grc/blocks_exponentiate_const_cci.xml | 45 +++++++++
gr-blocks/include/gnuradio/blocks/CMakeLists.txt | 1 +
.../gnuradio/blocks/exponentiate_const_cci.h | 66 +++++++++++++
gr-blocks/lib/CMakeLists.txt | 1 +
gr-blocks/lib/exponentiate_const_cci_impl.cc | 102 +++++++++++++++++++++
gr-blocks/lib/exponentiate_const_cci_impl.h | 53 +++++++++++
.../python/blocks/qa_exponentiate_const_cci.py | 66 +++++++++++++
gr-blocks/swig/blocks_swig7.i | 3 +
9 files changed, 338 insertions(+)