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

[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  bfcc9dc634cc8d7da77b109a7ad9cd90714fd768 (commit)
       via  f2e815329402f170231c054e108b531094d046be (commit)
      from  a3b74a25fcba67f61bf3cabb25286201f1263b0a (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 bfcc9dc634cc8d7da77b109a7ad9cd90714fd768
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 29 08:30:23 2012 -0700

    blocks: added gr::blocks::integrate_XX with ss ii ff cc

commit f2e815329402f170231c054e108b531094d046be
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 29 08:10:15 2012 -0700

    blocks: added gr::blocks::conjugate_cc

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

Summary of changes:
 gr-blocks/grc/blocks_block_tree.xml                |    2 +
 .../grc/blocks_conjugate_cc.xml                    |    6 ++--
 .../grc/blocks_integrate_xx.xml                    |    6 ++--
 gr-blocks/include/blocks/CMakeLists.txt            |    2 +
 .../blocks/{uchar_to_float.h => conjugate_cc.h}    |   16 ++++----
 .../blocks/{add_XX.h.t => integrate_XX.h.t}        |   12 +++----
 gr-blocks/lib/CMakeLists.txt                       |    2 +
 .../{int_to_float_impl.cc => conjugate_cc_impl.cc} |   30 ++++++++--------
 .../lib/{add_ff_impl.h => conjugate_cc_impl.h}     |   15 +++-----
 ...ultiply_XX_impl.cc.t => integrate_XX_impl.cc.t} |   35 +++++++++----------
 .../lib/{add_XX_impl.h.t => integrate_XX_impl.h.t} |    5 ++-
 .../gr => gr-blocks/python}/qa_conjugate.py        |    3 +-
 .../gr => gr-blocks/python}/qa_integrate.py        |    9 +++--
 gr-blocks/swig/blocks_swig.i                       |   15 ++++++++
 14 files changed, 88 insertions(+), 70 deletions(-)
 copy grc/blocks/gr_conjugate_cc.xml => gr-blocks/grc/blocks_conjugate_cc.xml 
(74%)
 copy grc/blocks/gr_integrate_xx.xml => gr-blocks/grc/blocks_integrate_xx.xml 
(86%)
 copy gr-blocks/include/blocks/{uchar_to_float.h => conjugate_cc.h} (72%)
 copy gr-blocks/include/blocks/{add_XX.h.t => integrate_XX.h.t} (84%)
 copy gr-blocks/lib/{int_to_float_impl.cc => conjugate_cc_impl.cc} (63%)
 copy gr-blocks/lib/{add_ff_impl.h => conjugate_cc_impl.h} (80%)
 copy gr-blocks/lib/{multiply_XX_impl.cc.t => integrate_XX_impl.cc.t} (66%)
 copy gr-blocks/lib/{add_XX_impl.h.t => integrate_XX_impl.h.t} (94%)
 copy {gnuradio-core/src/python/gnuradio/gr => 
gr-blocks/python}/qa_conjugate.py (96%)
 copy {gnuradio-core/src/python/gnuradio/gr => 
gr-blocks/python}/qa_integrate.py (93%)


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