[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.5.2.1-268-gef9d7de

[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  ef9d7dee4fb30f1961bcbfb1142b498b749ebd9a (commit)
       via  7097d4b8428088c86ef99bc90b8da67674f4ab8c (commit)
       via  aaa98c095a85724a8782a28717162c1d30d865c2 (commit)
      from  b2f8b4269558cdca3741ad9f3b6a9ee9114b1a8a (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 ef9d7dee4fb30f1961bcbfb1142b498b749ebd9a
Merge: b2f8b42 7097d4b
Author: Tom Rondeau <address@hidden>
Date:   Sat Apr 7 20:05:10 2012 -0400

    Merge branch 'master' into next
    
    Conflicts:
        gr-howto-write-a-block/Makefile.common
        gr-howto-write-a-block/config/gr_standalone.m4

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

Summary of changes:
 gr-howto-write-a-block/swig/CMakeLists.txt |    4 ++++
 gruel/src/swig/CMakeLists.txt              |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)


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