[Commit-gnuradio] [gnuradio] 06/06: Merge branch 'maint'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 84ca321c2664ba02fc84893b9b24ff67aa538c2f
Merge: 8bd013d e98373d
Author: Johnathan Corgan <address@hidden>
Date:   Wed Sep 24 15:50:45 2014 -0700

    Merge branch 'maint'

 .../gnuradio/digital/clock_recovery_mm_ff.h        |  2 +-
 gr-digital/lib/clock_recovery_mm_cc_impl.cc        | 48 +++++++++++++---------
 gr-digital/lib/clock_recovery_mm_cc_impl.h         | 12 ++----
 gr-digital/lib/clock_recovery_mm_ff_impl.cc        | 20 ++++++---
 gr-digital/lib/clock_recovery_mm_ff_impl.h         | 12 ++----
 gr-digital/python/digital/qa_clock_recovery_mm.py  | 44 ++++++++++----------
 6 files changed, 71 insertions(+), 67 deletions(-)