[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Thu, 14 Apr 2016 21:23:32 +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 d13de2faffc6e9c50d353e1c3567d688b326b805
Merge: 24028a5 bdf8517
Author: Johnathan Corgan <address@hidden>
Date: Thu Apr 14 14:07:40 2016 -0700
Merge branch 'master' into next
.../python/gnuradio/ctrlport/gr-perf-monitorx | 13 +-
gr-blocks/CMakeLists.txt | 1 +
{grc/blocks => gr-blocks/grc}/blks2_error_rate.xml | 1 +
{grc/blocks => gr-blocks/grc}/blks2_selector.xml | 1 +
{grc/blocks => gr-blocks/grc}/blks2_tcp_sink.xml | 1 +
{grc/blocks => gr-blocks/grc}/blks2_tcp_source.xml | 1 +
{grc/blocks => gr-blocks/grc}/blks2_valve.xml | 1 +
gr-blocks/grc/blocks_block_tree.xml | 7 +-
{grc/blocks => gr-blocks/grc}/xmlrpc_client.xml | 0
{grc/blocks => gr-blocks/grc}/xmlrpc_server.xml | 0
.../python}/grc_gnuradio/CMakeLists.txt | 8 +-
{grc => gr-blocks/python}/grc_gnuradio/README | 0
{grc => gr-blocks/python}/grc_gnuradio/__init__.py | 0
.../python}/grc_gnuradio/blks2/__init__.py | 10 +-
.../python}/grc_gnuradio/blks2/error_rate.py | 0
.../python}/grc_gnuradio/blks2/selector.py | 0
.../python}/grc_gnuradio/blks2/tcp.py | 0
gr-digital/CMakeLists.txt | 1 +
.../grc}/blks2_packet_decoder.xml | 1 +
.../grc}/blks2_packet_encoder.xml | 1 +
.../digital/qa_correlate_access_code_XX_ts.py | 90 +
.../python}/grc_gnuradio/CMakeLists.txt | 15 +-
.../python}/grc_gnuradio/blks2/packet.py | 0
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 +-
gr-utils/python/modtool/gr-newmod/CMakeLists.txt | 6 +
grc/CMakeLists.txt | 1 -
grc/blocks/block_tree.xml | 17 -
grc/gui/ActionHandler.py | 3 +
grc/gui/Actions.py | 6 +
grc/gui/Bars.py | 1 +
grc/gui/FlowGraph.py | 6 +-
grc/python/Platform.py | 2 +-
grc/python/flow_graph.tmpl | 9 +-
42 files changed, 268 insertions(+), 7315 deletions(-)