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

[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  a40ac1d61259dda14e5a6abf328004d3f4b17f02 (commit)
       via  86321b24cff6df788e12436ca62bde22effdb4c2 (commit)
       via  c39f8485e2f018363403336154ee30ea904e79a6 (commit)
      from  bd7b4a566da02a3e68857c7f5a6963a132a2f2d2 (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 a40ac1d61259dda14e5a6abf328004d3f4b17f02
Merge: bd7b4a5 86321b2
Author: Johnathan Corgan <address@hidden>
Date:   Sun Apr 1 11:00:07 2012 -0700

    Merge branch 'master' into next
    
    Conflicts:
        gr-fcd/lib/Makefile.am

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

Summary of changes:
 gr-fcd/include/fcd/fcd_source_c.h |   33 ++----
 gr-fcd/lib/CMakeLists.txt         |    2 +-
 gr-fcd/lib/fcd_source_c.cc        |  236 -------------------------------------
 gr-fcd/lib/fcd_source_c_impl.cc   |  222 ++++++++++++++++++++++++++++++++++
 gr-fcd/lib/fcd_source_c_impl.h    |   49 ++++++++
 5 files changed, 281 insertions(+), 261 deletions(-)
 delete mode 100644 gr-fcd/lib/fcd_source_c.cc
 create mode 100644 gr-fcd/lib/fcd_source_c_impl.cc
 create mode 100644 gr-fcd/lib/fcd_source_c_impl.h


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