[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/04: Merge branch 'maint'
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/04: Merge branch 'maint' |
|
Date: |
Thu, 14 Apr 2016 21:23:31 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit 282c8b00da2af069f8d91f51d9ed6cb394621fd3
Merge: 0ac619e e60a0fe
Author: Johnathan Corgan <address@hidden>
Date: Thu Apr 14 14:03:23 2016 -0700
Merge branch 'maint'
.../python/gnuradio/ctrlport/gr-perf-monitorx | 13 +-
gr-fec/ldpc_alist/CMakeLists.txt | 4 +-
gr-fec/ldpc_alist/n_2400_k_1198_gap_33.alist | 3602 --------------------
gr-fec/ldpc_alist/n_2400_k_1198_gen_matrix.alist | 3602 --------------------
gr-fec/lib/fec_mtrx_impl.cc | 13 +-
gr-fec/lib/ldpc_G_matrix_impl.cc | 16 +-
gr-fec/lib/ldpc_G_matrix_impl.h | 1 -
gr-fec/lib/ldpc_H_matrix_impl.cc | 83 +-
gr-fec/lib/ldpc_H_matrix_impl.h | 4 -
gr-fec/python/fec/LDPC/Generate_LDPC_matrix.py | 2 +-
.../fec/LDPC/Generate_LDPC_matrix_functions.py | 53 +-
grc/python/Platform.py | 2 +-
12 files changed, 118 insertions(+), 7277 deletions(-)