[Commit-gnuradio] [gnuradio] 07/07: Merge remote-tracking branch 'tom/issue890' into maint

[git]

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

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit 15b8f49fcb76483818a524adcb0a0456b94a15ba
Merge: 5634cfd 0f4859c
Author: Johnathan Corgan <address@hidden>
Date:   Wed Feb 3 09:49:22 2016 -0800

    Merge remote-tracking branch 'tom/issue890' into maint

 .../include/gnuradio/digital/pfb_clock_sync_ccf.h  |  11 ++-
 .../include/gnuradio/digital/pfb_clock_sync_fff.h  |  11 ++-
 gr-digital/lib/pfb_clock_sync_ccf_impl.cc          |  24 +++--
 gr-digital/lib/pfb_clock_sync_ccf_impl.h           |   5 +-
 gr-digital/lib/pfb_clock_sync_fff_impl.cc          |  23 +++--
 gr-digital/lib/pfb_clock_sync_fff_impl.h           |   3 +
 gr-digital/python/digital/qa_pfb_clock_sync.py     | 104 ++++++++++++++++++---
 7 files changed, 151 insertions(+), 30 deletions(-)