[Commit-gnuradio] [gnuradio] 05/06: 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 a27c212b71fc453a3ee3fa2f7e6391d094649427
Merge: 0924f3b 31d2c32
Author: Johnathan Corgan <address@hidden>
Date:   Thu Sep 8 12:28:40 2016 -0700

    Merge branch 'master' into next

 gr-trellis/examples/grc/.gitignore                 |    1 +
 .../examples/grc/interference_cancellation.grc     | 3482 +++++++++++++-------
 gr-trellis/examples/grc/pccc.grc                   | 1232 ++++---
 gr-trellis/examples/grc/sccc.grc                   | 1174 ++++---
 gr-trellis/examples/grc/tcm.grc                    | 1268 ++++---
 gr-trellis/examples/grc/turbo_equalization.grc     | 2818 +++++++++-------
 gr-trellis/examples/grc/viterbi_equalization.grc   | 1504 +++++----
 7 files changed, 6994 insertions(+), 4485 deletions(-)