[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 04/04: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 04/04: Merge branch 'master' into next |
|
Date: |
Sun, 5 Apr 2015 23:58:09 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit ae30e2111610810f72e33eca2efac936e9c22b2a
Merge: fa91968 cce2347
Author: Johnathan Corgan <address@hidden>
Date: Sun Apr 5 16:44:22 2015 -0700
Merge branch 'master' into next
gr-fec/grc/fec_block_tree.xml | 2 +
gr-fec/grc/ldpc_decoder_def_list.xml | 5 -
gr-fec/grc/ldpc_encoder_def_list.xml | 5 -
gr-fec/grc/tpc_decoder_def_list.xml | 142 +++++
gr-fec/grc/tpc_encoder_def_list.xml | 107 ++++
gr-fec/include/gnuradio/fec/tpc_common.h | 50 ++
gr-fec/include/gnuradio/fec/tpc_decoder.h | 156 +++++
gr-fec/include/gnuradio/fec/tpc_encoder.h | 111 ++++
gr-fec/lib/CMakeLists.txt | 3 +
gr-fec/lib/tpc_common.cc | 97 ++++
gr-fec/lib/tpc_decoder.cc | 909 ++++++++++++++++++++++++++++++
gr-fec/lib/tpc_encoder.cc | 342 +++++++++++
gr-fec/swig/fec_swig.i | 4 +
13 files changed, 1923 insertions(+), 10 deletions(-)