[Commit-gnuradio] [gnuradio] 18/25: Merge branch 'socis/master' into polar

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit a527ab880b83679f7237f78a86a27221366fcf76
Merge: 3474fcc 65c31b5
Author: Johannes Demel <address@hidden>
Date:   Wed Sep 23 10:11:46 2015 +0200

    Merge branch 'socis/master' into polar
    
    Conflicts:
        gr-fec/examples/polar_code_example.grc
        gr-fec/include/gnuradio/fec/polar_common.h
        gr-fec/include/gnuradio/fec/polar_decoder_common.h
        gr-fec/include/gnuradio/fec/polar_decoder_sc.h
        gr-fec/include/gnuradio/fec/polar_decoder_sc_list.h
        gr-fec/include/gnuradio/fec/polar_encoder.h

 gr-fec/doc/fec.dox                                 |    3 +
 gr-fec/examples/polar_code_example.grc             | 1895 ++++++++++++++++++--
 ...or.xml => variable_polar_code_configurator.xml} |    0
 ...ecoder_sc.xml => variable_polar_decoder_sc.xml} |    0
 ...list.xml => variable_polar_decoder_sc_list.xml} |    0
 ...olar_encoder.xml => variable_polar_encoder.xml} |    0
 gr-fec/include/gnuradio/fec/polar_common.h         |  108 +-
 gr-fec/include/gnuradio/fec/polar_decoder_common.h |  129 +-
 gr-fec/include/gnuradio/fec/polar_decoder_sc.h     |   80 +-
 .../include/gnuradio/fec/polar_decoder_sc_list.h   |  103 +-
 gr-fec/include/gnuradio/fec/polar_encoder.h        |  139 +-
 gr-fec/lib/polar_common.cc                         |  180 +-
 gr-fec/lib/polar_decoder_common.cc                 |  280 +--
 gr-fec/lib/polar_decoder_sc.cc                     |  110 +-
 gr-fec/lib/polar_decoder_sc_list.cc                |  160 +-
 gr-fec/lib/polar_encoder.cc                        |  356 ++--
 gr-fec/lib/scl_list.cc                             |  275 +--
 gr-fec/lib/scl_list.h                              |   90 +-
 18 files changed, 2749 insertions(+), 1159 deletions(-)