[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.4-712-g968ccc3

[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/gnuradio".

The branch, next has been updated
       via  968ccc37450f6ef0f49eb8a4adc75b86c8d19ec3 (commit)
       via  682b7c7c601446b64670f5041fa995ecffa06542 (commit)
       via  4c164f4cbb7fc9284bec147809b078d0a8ed9f88 (commit)
      from  ff9e66ad7c9f22bf2741e760940bb6609848ede8 (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 968ccc37450f6ef0f49eb8a4adc75b86c8d19ec3
Author: Tom Rondeau <address@hidden>
Date:   Thu Feb 28 23:05:40 2013 -0500

    blocks: removing references to argmax and max.

commit 682b7c7c601446b64670f5041fa995ecffa06542
Merge: ff9e66a 4c164f4
Author: Tom Rondeau <address@hidden>
Date:   Thu Feb 28 23:05:12 2013 -0500

    Merge branch 'master' into next
    
    Conflicts:
        gr-blocks/python/qa_argmax.py
        gr-blocks/python/qa_max.py

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

Summary of changes:
 gnuradio-core/src/lib/gengen/CMakeLists.txt        |    2 -
 gnuradio-core/src/lib/gengen/generate_common.py    |    2 -
 gnuradio-core/src/lib/gengen/gr_argmax_XX.cc.t     |   79 --------------------
 gnuradio-core/src/lib/gengen/gr_argmax_XX.h.t      |   52 -------------
 gnuradio-core/src/lib/gengen/gr_argmax_XX.i.t      |   34 ---------
 gnuradio-core/src/lib/gengen/gr_max_XX.cc.t        |   71 ------------------
 gnuradio-core/src/lib/gengen/gr_max_XX.h.t         |   52 -------------
 gnuradio-core/src/lib/gengen/gr_max_XX.i.t         |   34 ---------
 .../grc/blocks_argmax_xx.xml                       |    6 +-
 gr-blocks/grc/blocks_block_tree.xml                |    4 +-
 .../grc/blocks_max_xx.xml                          |   12 ++--
 gr-blocks/include/blocks/CMakeLists.txt            |    2 +
 .../blocks/{divide_XX.h.t => argmax_XX.h.t}        |   17 +++-
 .../include/blocks/{multiply_XX.h.t => max_XX.h.t} |   15 +++-
 gr-blocks/lib/CMakeLists.txt                       |    2 +
 gr-blocks/lib/add_XX_impl.h.t                      |    1 +
 .../lib/{rms_cf_impl.cc => argmax_XX_impl.cc.t}    |   61 +++++++++-------
 .../lib/{and_XX_impl.h.t => argmax_XX_impl.h.t}    |   10 ++-
 gr-blocks/lib/{rms_cf_impl.cc => max_XX_impl.cc.t} |   56 +++++++-------
 gr-blocks/lib/{and_XX_impl.h.t => max_XX_impl.h.t} |   10 ++-
 gr-blocks/python/qa_argmax.py                      |   53 ++++++-------
 gr-blocks/python/qa_max.py                         |   24 ++----
 gr-blocks/swig/blocks_swig.i                       |   18 +++++
 grc/blocks/block_tree.xml                          |    6 +-
 24 files changed, 166 insertions(+), 457 deletions(-)
 delete mode 100644 gnuradio-core/src/lib/gengen/gr_argmax_XX.cc.t
 delete mode 100644 gnuradio-core/src/lib/gengen/gr_argmax_XX.h.t
 delete mode 100644 gnuradio-core/src/lib/gengen/gr_argmax_XX.i.t
 delete mode 100644 gnuradio-core/src/lib/gengen/gr_max_XX.cc.t
 delete mode 100644 gnuradio-core/src/lib/gengen/gr_max_XX.h.t
 delete mode 100644 gnuradio-core/src/lib/gengen/gr_max_XX.i.t
 rename grc/blocks/gr_argmax_xx.xml => gr-blocks/grc/blocks_argmax_xx.xml (89%)
 rename grc/blocks/gr_max_xx.xml => gr-blocks/grc/blocks_max_xx.xml (83%)
 copy gr-blocks/include/blocks/{divide_XX.h.t => argmax_XX.h.t} (65%)
 copy gr-blocks/include/blocks/{multiply_XX.h.t => max_XX.h.t} (70%)
 copy gr-blocks/lib/{rms_cf_impl.cc => argmax_XX_impl.cc.t} (53%)
 copy gr-blocks/lib/{and_XX_impl.h.t => argmax_XX_impl.h.t} (82%)
 copy gr-blocks/lib/{rms_cf_impl.cc => max_XX_impl.cc.t} (57%)
 copy gr-blocks/lib/{and_XX_impl.h.t => max_XX_impl.h.t} (82%)


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