[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.4.1-1152-ga4d7d69

[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  a4d7d690988a5a082b63c1050d8e6a8b8bd35a6e (commit)
       via  669614b0f048de145ec41350f641f4af9c9b0d86 (commit)
       via  39c8fd8c335bac7b4f878473656c965c6d9c2c73 (commit)
       via  4f35e2c0e7ca3d7bbe4b6d3fb47539789ee3f045 (commit)
      from  fa98286f6f80c203bf80c243a2774f6de7a4b5c8 (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 a4d7d690988a5a082b63c1050d8e6a8b8bd35a6e
Merge: fa98286 669614b
Author: Johnathan Corgan <address@hidden>
Date:   Wed Apr 17 15:57:10 2013 -0700

    Merge branch 'master' into next
    
    Conflicts:
        gr-uhd/include/gr_uhd_usrp_sink.h
        gr-uhd/include/gr_uhd_usrp_source.h
        gr-uhd/lib/gr_uhd_usrp_sink.cc
        gr-uhd/lib/gr_uhd_usrp_source.cc

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

Summary of changes:
 gr-uhd/grc/gen_uhd_usrp_blocks.py |    9 +++++-
 gr-uhd/include/uhd/usrp_sink.h    |   14 ++++++++++
 gr-uhd/include/uhd/usrp_source.h  |   14 ++++++++++
 gr-uhd/lib/gr_uhd_common.h        |   52 -------------------------------------
 gr-uhd/lib/usrp_sink_impl.cc      |   12 ++++++++
 gr-uhd/lib/usrp_sink_impl.h       |    2 +
 gr-uhd/lib/usrp_source_impl.cc    |   12 ++++++++
 gr-uhd/lib/usrp_source_impl.h     |    2 +
 8 files changed, 64 insertions(+), 53 deletions(-)
 delete mode 100644 gr-uhd/lib/gr_uhd_common.h


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