[Commit-gnuradio] [gnuradio] 04/04: Merge branch 'costas_snr'

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit 7f81c7d24c05fc6d35754b8ee0afc0a1b8886cad
Merge: 3bf54ce fdf13bd
Author: Tom Rondeau <address@hidden>
Date:   Tue Oct 21 16:59:22 2014 -0400

    Merge branch 'costas_snr'

 gr-blocks/include/gnuradio/blocks/control_loop.h   | 81 +++++++++++++++++++++
 gr-digital/grc/digital_costas_loop_cc.xml          | 84 ++++++++++++++--------
 .../include/gnuradio/digital/costas_loop_cc.h      |  9 ++-
 gr-digital/lib/costas_loop_cc_impl.cc              | 68 ++++++++++++++++--
 gr-digital/lib/costas_loop_cc_impl.h               | 45 ++++++++++--
 gr-digital/python/digital/qa_costas_loop_cc.py     | 22 +++---
 6 files changed, 255 insertions(+), 54 deletions(-)