[Commit-gnuradio] [gnuradio] 04/04: Merge branch 'fec/add_mtu_setting'

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit 222e0003f9797a1b92d64855bd2b93f0d9099f93
Merge: c8c5b50 82dfb5b
Author: Tom Rondeau <address@hidden>
Date:   Fri Sep 25 11:20:49 2015 -0400

    Merge branch 'fec/add_mtu_setting'
    
    Conflicts:
        gr-fec/lib/async_decoder_impl.cc

 gr-fec/examples/fecapi_async_decoders.grc    |   79 +-
 gr-fec/examples/fecapi_async_encoders.grc    |   32 +-
 gr-fec/examples/fecapi_tagged_decoders.grc   | 1941 ++++++++++++++------------
 gr-fec/grc/fec_async_decoder.xml             |    9 +-
 gr-fec/grc/fec_async_encoder.xml             |    9 +-
 gr-fec/grc/fec_extended_tagged_decoder.xml   |    9 +-
 gr-fec/grc/fec_extended_tagged_encoder.xml   |    9 +-
 gr-fec/grc/fec_tagged_decoder.xml            |    9 +-
 gr-fec/grc/fec_tagged_encoder.xml            |    9 +-
 gr-fec/include/gnuradio/fec/async_decoder.h  |    6 +-
 gr-fec/include/gnuradio/fec/async_encoder.h  |    6 +-
 gr-fec/include/gnuradio/fec/tagged_decoder.h |    6 +-
 gr-fec/include/gnuradio/fec/tagged_encoder.h |    6 +-
 gr-fec/lib/async_decoder_impl.cc             |   34 +-
 gr-fec/lib/async_decoder_impl.h              |    4 +-
 gr-fec/lib/async_encoder_impl.cc             |   21 +-
 gr-fec/lib/async_encoder_impl.h              |    4 +-
 gr-fec/lib/tagged_decoder_impl.cc            |   21 +-
 gr-fec/lib/tagged_decoder_impl.h             |    4 +-
 gr-fec/lib/tagged_encoder_impl.cc            |   20 +-
 gr-fec/lib/tagged_encoder_impl.h             |    4 +-
 gr-fec/python/fec/extended_tagged_decoder.py |    5 +-
 gr-fec/python/fec/extended_tagged_encoder.py |    4 +-
 23 files changed, 1267 insertions(+), 984 deletions(-)