[Commit-gnuradio] [gnuradio] 01/01: 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 13b69807d0881c233f0cd5b73e5a07425852777c
Merge: 161147d 15b8f49
Author: Johnathan Corgan <address@hidden>
Date:   Wed Feb 3 10:19:14 2016 -0800

    Merge branch 'maint'

 gnuradio-runtime/lib/hier_block2_detail.cc         |  40 ++++++++
 gnuradio-runtime/lib/hier_block2_detail.h          |   1 +
 .../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 ++++++++++++++++++---
 gr-qtgui/grc/qtgui_freq_sink_x.xml                 |   2 +-
 grc/gui/Messages.py                                |   2 +-
 grc/python/Block.py                                |   7 +-
 grc/python/Generator.py                            |  49 +++++++---
 grc/python/epy_block_io.py                         |  12 +--
 14 files changed, 241 insertions(+), 53 deletions(-)