[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.5.1-157-g8a4a83a

[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  8a4a83a768d205a28b8deced03a0ed4289e6f60f (commit)
       via  34508cd9001ecd8eef2fcfb3a087c573072b83ef (commit)
       via  3a3ff1b581071f154efc2c01d34db67a0ebfffab (commit)
       via  0062ab7175ddfe161eb718557b155b79285fa3ea (commit)
      from  748e3e84fe921cf03adbd9f411105af6202df763 (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 8a4a83a768d205a28b8deced03a0ed4289e6f60f
Merge: 748e3e8 34508cd
Author: Johnathan Corgan <address@hidden>
Date:   Fri Feb 17 13:51:00 2012 -0800

    Merge branch 'master' into next
    
    Conflicts:
        gr-vocoder/grc/Makefile.am
        grc/blocks/Makefile.am

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

Summary of changes:
 gr-vocoder/grc/vocoder_block_tree.xml        |    1 -
 gr-vocoder/grc/vocoder_g721_decode_bs.xml    |    6 +++---
 gr-vocoder/grc/vocoder_g723_24_decode_bs.xml |    8 ++++----
 gr-vocoder/grc/vocoder_g723_40_decode_bs.xml |    8 ++++----
 gr-vocoder/grc/vocoder_gsm_fr_decode_ps.xml  |    4 ++--
 gr-vocoder/grc/vocoder_gsm_fr_encode_sp.xml  |    4 ++--
 6 files changed, 15 insertions(+), 16 deletions(-)


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