[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 a32010b52bbafd82b4f66ef508457fe1b6f8031f
Merge: a6323e3 884eddf
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jan 30 05:25:03 2017 -0800

    Merge branch 'maint'

 gr-blocks/grc/blocks_xor_xx.xml                   |   2 +-
 gr-blocks/lib/peak_detector2_fb_impl.cc           |   3 +-
 gr-blocks/lib/peak_detector_XX_impl.cc.t          |   3 +-
 gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc |   9 +-
 gr-fec/include/gnuradio/fec/CMakeLists.txt        |   6 +-
 gr-qtgui/grc/qtgui_time_sink_x.xml                | 112 +++++++++++-----------
 6 files changed, 71 insertions(+), 64 deletions(-)