[Commit-gnuradio] [gnuradio] 04/08: Merge remote-tracking branch 'garverp/corr_est_parabolicinterp'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 71428c93bbfd7ad46084ca157e2a9d70eb848af0
Merge: 7cbd94f 8d336d2
Author: Johnathan Corgan <address@hidden>
Date:   Wed Aug 5 13:27:38 2015 -0700

    Merge remote-tracking branch 'garverp/corr_est_parabolicinterp'

 gr-digital/lib/corr_est_cc_impl.cc | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)