[Commit-gnuradio] [gnuradio] 42/43: Merge remote-tracking branch 'michaelld/misc_fixes'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit d3a6160b8ec5e3664bfb2c39e80d3106774cc7f6
Merge: f128144 e937ed0
Author: Johnathan Corgan <address@hidden>
Date:   Thu Apr 2 12:07:53 2015 -0700

    Merge remote-tracking branch 'michaelld/misc_fixes'

 gr-dtv/lib/atsc/atsc_sync_impl.cc | 7 +++++++
 gr-dtv/lib/atsc/atsc_sync_impl.h  | 7 -------
 gr-fec/lib/cc_decoder_impl.cc     | 2 +-
 gr-fec/lib/cc_decoder_impl.h      | 1 -
 gr-qtgui/lib/displayform.cc       | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)