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

[git]

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

trondeau pushed a commit to branch next
in repository gnuradio.

commit 90341be48bc7f9cf917f2fb6ef23cb07c6e7bbf2
Merge: 97d6412 7f81c7d
Author: Tom Rondeau <address@hidden>
Date:   Tue Oct 21 17:03:51 2014 -0400

    Merge branch 'master' into next

 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 +++---
 gr-qtgui/lib/time_sink_c_impl.cc                   |  4 +-
 gr-qtgui/lib/time_sink_f_impl.cc                   |  4 +-
 8 files changed, 259 insertions(+), 58 deletions(-)