[Commit-gnuradio] git://gnuradio.org/jblum branch, next, updated. 942fa1c2e226ac00ac8ac0d8ca1538f7015d0c5a

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

The branch, next has been updated
       via  942fa1c2e226ac00ac8ac0d8ca1538f7015d0c5a (commit)
       via  4059269b4261c891923658a6faa0fa780888449b (commit)
       via  0a9233a7ab7f14a2056a494d4ad9f6c1e09988d0 (commit)
       via  a209853b61970254a17e06a68849848850c60fe0 (commit)
       via  bb98061115a2c7299fb24ed90ba48786118bf32e (commit)
       via  f55fe0bd647131388bfbfa1637317660df59b86b (commit)
       via  ecd4271b0b71a832ef5c2c74dc14f05df7be8d93 (commit)
       via  d44d733a5fc8dfc2700b26013c68ebc65a7ff8c3 (commit)
       via  efe4b714c067348d54b64a572e5309bea5765674 (commit)
       via  c091c56ee98f0f2eca891ebc23524925f7d1a74a (commit)
      from  6b4fb9612f5ea460c79e80facba01c504a3d5049 (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 942fa1c2e226ac00ac8ac0d8ca1538f7015d0c5a
Merge: bb98061 4059269
Author: Josh Blum <address@hidden>
Date:   Thu Sep 22 12:51:09 2011 -0700

    Merge branch 'next' of gnuradio.org:gnuradio into next
    
    Conflicts:
        gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h
        volk/bootstrap

commit 4059269b4261c891923658a6faa0fa780888449b
Merge: 27941c3 0a9233a
Author: Tom Rondeau <address@hidden>
Date:   Thu Sep 22 14:18:14 2011 -0400

    Merge branch 'master' into next

commit 0a9233a7ab7f14a2056a494d4ad9f6c1e09988d0
Merge: d44d733 a209853
Author: Tom Rondeau <address@hidden>
Date:   Thu Sep 22 14:18:02 2011 -0400

    Merge branch 'maint'

commit a209853b61970254a17e06a68849848850c60fe0
Author: Josh Blum <address@hidden>
Date:   Fri Sep 16 13:16:27 2011 -0400

    grc: one line fix to fix port duplicator when removing ports
    
    was an issue when removing more than one port

commit d44d733a5fc8dfc2700b26013c68ebc65a7ff8c3
Author: Tom Rondeau <address@hidden>
Date:   Wed Sep 21 10:34:39 2011 -0400

    core: Doxygen comments for added tag name parameter.

commit efe4b714c067348d54b64a572e5309bea5765674
Author: Tom Rondeau <address@hidden>
Date:   Wed Sep 21 10:33:51 2011 -0400

    volk: a way of doing -B in python that is 2.5 compatible (picked from Josh 
Blum's work).

commit c091c56ee98f0f2eca891ebc23524925f7d1a74a
Author: Matt Ettus <address@hidden>
Date:   Wed Sep 7 15:25:41 2011 -0700

    logpwrfft.py -- need to average the square, not square the average.  Then 
do proper scaling (no more 3dB kludge).

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

Summary of changes:
 cmake/Modules/GrPython.cmake                       |   12 +
 gnuradio-core/src/lib/filter/CMakeLists.txt        |    7 +-
 .../lib/general/gr_correlate_access_code_tag_bb.h  |   15 +-
 gnuradio-core/src/lib/gengen/CMakeLists.txt        |  233 +++++++++-----------
 gr-trellis/src/lib/CMakeLists.txt                  |  178 ++++++++-------
 grc/python/Block.py                                |    2 +-
 volk/bootstrap                                     |    2 +-
 7 files changed, 223 insertions(+), 226 deletions(-)


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