[Commit-gnuradio] [gnuradio] 05/05: Merge remote-tracking branch 'gnuradio-github/pr/1246'

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 1d477a701487dc111c88ae595fbfecadb5d871ac
Merge: c73a73f e2df7af
Author: Johnathan Corgan <address@hidden>
Date:   Mon Mar 27 14:19:45 2017 -0700

    Merge remote-tracking branch 'gnuradio-github/pr/1246'

 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(+)