[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: |
Tue, 10 Nov 2015 01:02:10 +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 ac59ecb2f508d1df6d82f9d934b97924467e5250
Merge: 3e5baa8 513426a
Author: Johnathan Corgan <address@hidden>
Date: Mon Nov 9 16:52:03 2015 -0800
Merge branch 'master' into next
gr-blocks/grc/blocks_block_tree.xml | 2 +
gr-blocks/grc/blocks_complex_to_magphase.xml | 36 +++++++++++
gr-blocks/grc/blocks_magphase_to_complex.xml | 36 +++++++++++
gr-blocks/include/gnuradio/blocks/CMakeLists.txt | 2 +
.../include/gnuradio/blocks/complex_to_magphase.h | 57 +++++++++++++++++
.../include/gnuradio/blocks/magphase_to_complex.h | 53 ++++++++++++++++
gr-blocks/lib/CMakeLists.txt | 2 +
gr-blocks/lib/complex_to_magphase_impl.cc | 73 ++++++++++++++++++++++
gr-blocks/lib/complex_to_magphase_impl.h | 47 ++++++++++++++
gr-blocks/lib/magphase_to_complex_impl.cc | 68 ++++++++++++++++++++
gr-blocks/lib/magphase_to_complex_impl.h | 47 ++++++++++++++
gr-blocks/swig/blocks_swig2.i | 3 +
gr-blocks/swig/blocks_swig3.i | 3 +
13 files changed, 429 insertions(+)