[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. 3.6git-13-gc51087b

[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  c51087bb7f005981f4b74c6a48f59a5982721951 (commit)
       via  fe21bc676424196a228ba4fe9c924e3ae1954e07 (commit)
       via  8cee087b35b4692863a170c1a88e3fda36a005c6 (commit)
       via  c08487898c1be6a44f3cd19c0e7ff78095033efe (commit)
       via  1fe488b97ce715ddcab6fa2e3640596a5f23a4e1 (commit)
       via  e24ad4b104cc6a7ef6e516ade324cfeea752d1c5 (commit)
       via  fe1e9b77d7f4b48af3ab309321dc79c74e79a290 (commit)
       via  90c6010d0f790af8a652213ffc1ee8db1cfb9b6d (commit)
      from  912cd08e133dae9fa9ceec055ba23cd970a0c254 (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 c51087bb7f005981f4b74c6a48f59a5982721951
Merge: 912cd08 fe21bc6
Author: Johnathan Corgan <address@hidden>
Date:   Sun Dec 11 13:07:11 2011 -0800

    Merge branch 'master' into next
    
    Conflicts:
        config/lf_warnings.m4
        volk/config/lf_warnings.m4

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

Summary of changes:
 CMakeLists.txt                                     |    1 +
 cmake/Modules/GrSwig.cmake                         |    7 +++----
 .../src/lib/general/gr_simple_framer_sync.h        |    2 +-
 gr-vocoder/lib/codec2/fft.c                        |    2 +-
 gr-vocoder/lib/codec2/interp.c                     |    3 ++-
 volk/include/volk/volk_32f_s32f_power_32f_a.h      |    4 ++--
 volk/include/volk/volk_32fc_s32f_atan2_32f_a.h     |    4 ++--
 volk/include/volk/volk_32fc_s32f_power_32fc_a.h    |    2 +-
 .../volk/volk_32fc_x2_conjugate_dot_prod_32fc_u.h  |    3 ++-
 volk/orc/volk_16ic_magnitude_16i_a_orc_impl.orc    |    2 +-
 .../volk_16sc_magnitude_32f_aligned16_orc_impl.orc |    2 +-
 volk/orc/volk_32f_sqrt_32f_a_orc_impl.orc          |    2 +-
 volk/orc/volk_32fc_magnitude_32f_a_orc_impl.orc    |    2 +-
 .../volk_32fc_s32f_magnitude_16i_a_orc_impl.orc    |    2 +-
 14 files changed, 20 insertions(+), 18 deletions(-)


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