[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5 |
|
Date: |
Sun, 27 Mar 2016 13:57:58 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next-qt5
in repository gnuradio.
commit ad3dca7a82792f3a45bbbe57b08a2c7e6d044ad0
Merge: e5d5794 315880c
Author: Johnathan Corgan <address@hidden>
Date: Sun Mar 27 06:55:58 2016 -0700
Merge branch 'next' into next-qt5
gnuradio-runtime/include/pmt/pmt.h | 4 +-
.../python/gnuradio/ctrlport/gr-perf-monitorx | 46 +++++++++++--------
.../include/gnuradio/blocks/vector_source_X.h.t | 1 +
gr-blocks/lib/vector_source_X_impl.h.t | 1 +
gr-blocks/python/blocks/qa_vector_sink_source.py | 36 +++++++++++++++
gr-digital/grc/digital_constellation.xml | 51 ++++++++++++++++++++--
gr-fec/examples/ber_curve_gen_ldpc.grc | 22 ++++------
gr-fec/grc/fec_bercurve_generator.xml | 9 ++++
gr-fec/grc/ldpc_decoder_def_list.xml | 6 ++-
gr-fec/grc/variable_ldpc_G_matrix_object.xml | 2 +-
gr-fec/grc/variable_ldpc_H_matrix_object.xml | 2 +-
gr-fec/grc/variable_ldpc_bit_flip_decoder.xml | 12 +++--
gr-fec/grc/variable_ldpc_encoder_G.xml | 11 +++--
gr-fec/grc/variable_ldpc_encoder_H.xml | 6 ++-
gr-fec/python/fec/bercurve_generator.py | 6 +++
15 files changed, 166 insertions(+), 49 deletions(-)