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

[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  104aa2b5827ccc7c30baff7bff139ab7a85fa9f9 (commit)
       via  dd387a3708196f382f0c1e8041077bf94038ae98 (commit)
       via  e234e2b2f5d366fd73dd09f106ca72e22315b0a6 (commit)
       via  b1f34f61dd4cb2d0aecf4f1763a59fd4a4fa0579 (commit)
      from  0fa5d821e0bb6d98388a0bf766837cbd6c73451f (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 104aa2b5827ccc7c30baff7bff139ab7a85fa9f9
Merge: 0fa5d82 dd387a3
Author: Tom Rondeau <address@hidden>
Date:   Sun Apr 7 10:44:17 2013 -0400

    Merge branch 'master' into next
    
    Also updating to make changes in maint/master to next.
    
    Conflicts:
        docs/doxygen/CMakeLists.txt
        gnuradio-runtime/lib/pmt/CMakeLists.txt
        gr-digital/lib/digital_impl_mpsk_snr_est.cc
        gr-digital/lib/digital_mpsk_snr_est_cc.cc
        gr-digital/python/qa_mpsk_snr_est.py

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

Summary of changes:
 docs/doxygen/CMakeLists.txt             |    5 ++++-
 gnuradio-runtime/lib/CMakeLists.txt     |    2 +-
 gnuradio-runtime/lib/pmt/CMakeLists.txt |    5 +++--
 gr-digital/lib/mpsk_snr_est.cc          |    4 ++--
 gr-digital/lib/mpsk_snr_est_cc_impl.cc  |    2 +-
 gr-digital/python/qa_mpsk_snr_est.py    |    2 +-
 6 files changed, 12 insertions(+), 8 deletions(-)


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