[Commit-gnuradio] [gnuradio] 04/05: Merge branch 'master' into next

[git]

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

jcorgan pushed a commit to branch next
in repository gnuradio.

commit 0d999140bec09815b45817efa8747e8682b4819f
Merge: 66f42fe b17bcb8
Author: Johnathan Corgan <address@hidden>
Date:   Tue Dec 29 14:17:40 2015 -0800

    Merge branch 'master' into next

 gr-dtv/CMakeLists.txt                              |   2 +
 gr-dtv/examples/CMakeLists.txt                     |  25 +++-
 gr-dtv/examples/atsc_ctrlport_monitor.py           | 149 +++++++++++++++++++++
 gr-dtv/include/gnuradio/dtv/atsc_equalizer.h       |   3 +
 gr-dtv/include/gnuradio/dtv/atsc_rs_decoder.h      |  15 +++
 gr-dtv/include/gnuradio/dtv/atsc_viterbi_decoder.h |   6 +
 gr-dtv/lib/atsc/atsc_equalizer_impl.cc             |  89 +++++++++---
 gr-dtv/lib/atsc/atsc_equalizer_impl.h              |   7 +-
 gr-dtv/lib/atsc/atsc_rs_decoder_impl.cc            |  89 +++++++++---
 gr-dtv/lib/atsc/atsc_rs_decoder_impl.h             |  13 +-
 gr-dtv/lib/atsc/atsc_single_viterbi.cc             |  65 +++++----
 gr-dtv/lib/atsc/atsc_single_viterbi.h              |  17 ++-
 gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.cc       |  25 ++++
 gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.h        |   4 +
 14 files changed, 430 insertions(+), 79 deletions(-)