[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 04/06: Merge branch 'maint'
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 04/06: Merge branch 'maint' |
|
Date: |
Sun, 27 Mar 2016 13:57:57 +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 497ab7b78d314f1f718b5749729d91f92925b238
Merge: 64a702e 4ab650a
Author: Johnathan Corgan <address@hidden>
Date: Sun Mar 27 06:24:31 2016 -0700
Merge branch 'maint'
gnuradio-runtime/include/pmt/pmt.h | 4 +-
.../python/gnuradio/ctrlport/gr-perf-monitorx | 46 ++++++++++++++--------
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 +++
11 files changed, 80 insertions(+), 46 deletions(-)
- [Commit-gnuradio] [gnuradio] branch master updated (64a702e -> d44dae8), git, 2016/03/27
- [Commit-gnuradio] [gnuradio] 06/06: Merge remote-tracking branch 'nwest/vector-repeat', git, 2016/03/27
- [Commit-gnuradio] [gnuradio] 02/06: blocks: add a setter for repeat flag on vector source, git, 2016/03/27
- [Commit-gnuradio] [gnuradio] 05/06: Merge remote-tracking branch 'noc0lour/constellation_add_new_types_grc', git, 2016/03/27
- [Commit-gnuradio] [gnuradio] 04/06: Merge branch 'maint',
git <=
- [Commit-gnuradio] [gnuradio] 01/06: gr-digital: add more constellation types to grc constellation block, git, 2016/03/27
- [Commit-gnuradio] [gnuradio] 03/06: blocks: annotate QA and add tests for vector_sourc_sink setters, git, 2016/03/27