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

[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  70d89e2051264876055fe9f73cbcb2823806b3ee (commit)
       via  ee1a53b4a971e4b9623f504628231a273157f462 (commit)
       via  25b0d584f5189c39817af98d403c461a59dd3419 (commit)
       via  0905a4973b54e3f5cdee6b33bcc85445463b1597 (commit)
       via  d0b2c5e6c6fe56541cd0f2242f53b2f2c33642e0 (commit)
       via  75fac1e1476578cd354a2cc586af23da88ce4b12 (commit)
       via  feaa399ba51e8959e92cf9b73375db1c6b638b3f (commit)
      from  bfcc9dc634cc8d7da77b109a7ad9cd90714fd768 (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 70d89e2051264876055fe9f73cbcb2823806b3ee
Author: Johnathan Corgan <address@hidden>
Date:   Sun Jul 1 09:15:14 2012 -0700

    blocks: added gr::blocks::nlog10_ff

commit ee1a53b4a971e4b9623f504628231a273157f462
Author: Johnathan Corgan <address@hidden>
Date:   Sat Jun 30 08:26:58 2012 -0700

    blocks: aded gr::blocks::multiply_conjugate_cc

commit 25b0d584f5189c39817af98d403c461a59dd3419
Merge: bfcc9dc 0905a49
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 29 11:01:04 2012 -0700

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

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

Summary of changes:
 gnuradio-core/src/lib/io/gri_wavfile.cc            |   46 ++++++++++++-------
 gr-audio/lib/osx/audio_osx.h                       |    3 +-
 gr-blocks/grc/blocks_block_tree.xml                |    2 +
 ...omplex.xml => blocks_multiply_conjugate_cc.xml} |   19 ++++----
 .../grc/blocks_nlog10_ff.xml                       |    6 +-
 gr-blocks/include/blocks/CMakeLists.txt            |    2 +
 .../{multiply_cc.h => multiply_conjugate_cc.h}     |   14 +++---
 .../include/blocks/{conjugate_cc.h => nlog10_ff.h} |   22 ++++++---
 gr-blocks/lib/CMakeLists.txt                       |    2 +
 ...ly_cc_impl.cc => multiply_conjugate_cc_impl.cc} |   26 ++++++------
 ..._to_arg_impl.h => multiply_conjugate_cc_impl.h} |   12 +++---
 .../{complex_to_mag_impl.cc => nlog10_ff_impl.cc}  |   30 ++++++-------
 gr-blocks/lib/{add_ff_impl.h => nlog10_ff_impl.h}  |   14 +++---
 .../python}/qa_multiply_conjugate.py               |    3 +-
 .../gnuradio/gr => gr-blocks/python}/qa_nlog10.py  |    5 +-
 gr-blocks/swig/blocks_swig.i                       |    6 +++
 volk/include/volk/volk_32fc_x2_dot_prod_32fc_a.h   |    2 +-
 17 files changed, 123 insertions(+), 91 deletions(-)
 copy gr-blocks/grc/{blocks_float_to_complex.xml => 
blocks_multiply_conjugate_cc.xml} (64%)
 copy grc/blocks/gr_nlog10_ff.xml => gr-blocks/grc/blocks_nlog10_ff.xml (84%)
 copy gr-blocks/include/blocks/{multiply_cc.h => multiply_conjugate_cc.h} (73%)
 copy gr-blocks/include/blocks/{conjugate_cc.h => nlog10_ff.h} (63%)
 copy gr-blocks/lib/{multiply_cc_impl.cc => multiply_conjugate_cc_impl.cc} (66%)
 copy gr-blocks/lib/{complex_to_arg_impl.h => multiply_conjugate_cc_impl.h} 
(76%)
 copy gr-blocks/lib/{complex_to_mag_impl.cc => nlog10_ff_impl.cc} (64%)
 copy gr-blocks/lib/{add_ff_impl.h => nlog10_ff_impl.h} (79%)
 copy {gnuradio-core/src/python/gnuradio/gr => 
gr-blocks/python}/qa_multiply_conjugate.py (96%)
 copy {gnuradio-core/src/python/gnuradio/gr => gr-blocks/python}/qa_nlog10.py 
(92%)


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