[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch next
in repository gnuradio.

commit aff9b97e60f6e45d326e2d2532962298ae2926a1
Merge: 5d6e878 1425e48
Author: Johnathan Corgan <address@hidden>
Date:   Sun Apr 26 18:34:20 2015 -0700

    Merge branch 'master' into next
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.

 gr-digital/grc/digital_corr_est_cc.xml            |  9 +++
 gr-digital/include/gnuradio/digital/corr_est_cc.h |  6 ++
 gr-digital/lib/corr_est_cc_impl.cc                | 73 +++++++++++++++++++----
 gr-digital/lib/corr_est_cc_impl.h                 | 13 +++-
 4 files changed, 87 insertions(+), 14 deletions(-)