[Commit-gnuradio] git://gnuradio.org/jcorgan branch, wip/gr-blocks-master, updated. 3.6.1git-297-g07d6c6c

[git version control]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "git://gnuradio.org/jcorgan".

The branch, wip/gr-blocks-master has been updated
       via  07d6c6cb4f20a6d1e1885aa14e36f05b53cf7df2 (commit)
       via  3a142bebafdc018bccc80cf124a375b53db03581 (commit)
       via  4e06f35f611aff2e1d4983327da54cf63e5b9ada (commit)
      from  27694edd168bc1260ff04950e837a6580afc49ab (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 07d6c6cb4f20a6d1e1885aa14e36f05b53cf7df2
Merge: 4e06f35 3a142be
Author: Johnathan Corgan <address@hidden>
Date:   Sat Jul 7 15:27:54 2012 -0700

    Merge branch 'master' into wip/gr-blocks-master

commit 4e06f35f611aff2e1d4983327da54cf63e5b9ada
Author: Johnathan Corgan <address@hidden>
Date:   Sat Jul 7 07:06:51 2012 -0700

    blocks: added gr::blocks::keep_one_in_n

-----------------------------------------------------------------------

Summary of changes:
 gnuradio-core/CMakeLists.txt                       |    4 +-
 gnuradio-core/src/lib/general/CMakeLists.txt       |    1 -
 gnuradio-core/src/lib/general/general.i            |    3 +-
 gnuradio-core/src/lib/general/gr_block_gateway.cc  |  184 ---------------
 gnuradio-core/src/lib/general/gr_block_gateway.h   |  212 ------------------
 gnuradio-core/src/lib/general/gr_block_gateway.i   |   46 ----
 .../src/python/gnuradio/gr/CMakeLists.txt          |    3 -
 gnuradio-core/src/python/gnuradio/gr/__init__.py   |    3 +-
 gnuradio-core/src/python/gnuradio/gr/gateway.py    |  215 ------------------
 .../src/python/gnuradio/gr/qa_block_gateway.py     |  235 --------------------
 gr-blocks/grc/blocks_block_tree.xml                |    1 +
 .../grc/blocks_keep_one_in_n.xml                   |    6 +-
 gr-blocks/include/blocks/CMakeLists.txt            |    1 +
 .../blocks/{deinterleave.h => keep_one_in_n.h}     |   21 +-
 gr-blocks/lib/CMakeLists.txt                       |    1 +
 gr-blocks/lib/keep_one_in_n_impl.cc                |  109 +++++++++
 .../blocks/and_XX.h.t => lib/keep_one_in_n_impl.h} |   36 ++--
 .../python/qa_keep_one_in_n.py                     |   23 +-
 gr-blocks/swig/blocks_swig.i                       |    3 +
 19 files changed, 164 insertions(+), 943 deletions(-)
 delete mode 100644 gnuradio-core/src/lib/general/gr_block_gateway.cc
 delete mode 100644 gnuradio-core/src/lib/general/gr_block_gateway.h
 delete mode 100644 gnuradio-core/src/lib/general/gr_block_gateway.i
 delete mode 100644 gnuradio-core/src/python/gnuradio/gr/gateway.py
 delete mode 100644 gnuradio-core/src/python/gnuradio/gr/qa_block_gateway.py
 copy grc/blocks/gr_keep_one_in_n.xml => gr-blocks/grc/blocks_keep_one_in_n.xml 
(89%)
 copy gr-blocks/include/blocks/{deinterleave.h => keep_one_in_n.h} (69%)
 create mode 100644 gr-blocks/lib/keep_one_in_n_impl.cc
 copy gr-blocks/{include/blocks/and_XX.h.t => lib/keep_one_in_n_impl.h} (63%)
 copy gnuradio-core/src/python/gnuradio/gr/qa_tag_debug.py => 
gr-blocks/python/qa_keep_one_in_n.py (67%)


hooks/post-receive
-- 
git://gnuradio.org/jcorgan