[Commit-gnuradio] [gnuradio] 05/07: 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 67f7d12f740ea01534f8c979feafa9793d6a3515
Merge: d57a138 0ae4737
Author: Johnathan Corgan <address@hidden>
Date:   Mon Sep 19 06:52:40 2016 -0700

    Merge branch 'maint'

 gr-dtv/lib/atsc/atsc_sync_impl.cc                  | 42 +++++++++++-----------
 gr-dtv/lib/atsc/atsc_sync_impl.h                   | 10 +++---
 gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h |  1 +
 gr-qtgui/lib/freqcontrolpanel.cc                   | 13 ++++++-
 gr-qtgui/lib/freqdisplayform.cc                    |  3 ++
 5 files changed, 41 insertions(+), 28 deletions(-)