[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: |
Mon, 2 May 2016 04:54:38 +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 6b3a2516e4cff2508e3ab47d2fd58a0305221269
Merge: 2eeb3c1 6aa995a
Author: Johnathan Corgan <address@hidden>
Date: Sun May 1 21:52:21 2016 -0700
Merge branch 'master' into next
gnuradio-runtime/lib/pmt/pmt_serialize.cc | 2 +-
gr-digital/grc/digital_header_payload_demux.xml | 7 +
.../gnuradio/digital/header_payload_demux.h | 91 ++-
.../include/gnuradio/digital/packet_header_ofdm.h | 1 -
gr-digital/lib/header_payload_demux_impl.cc | 670 ++++++++++++---------
gr-digital/lib/header_payload_demux_impl.h | 75 ++-
gr-digital/lib/packet_header_default.cc | 8 +-
gr-digital/lib/packet_header_ofdm.cc | 55 +-
gr-digital/lib/packet_headergenerator_bb_impl.cc | 3 +-
.../python/digital/qa_header_payload_demux.py | 451 ++++++++++----
.../python/digital/qa_packet_headerparser_b.py | 7 +-
gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc | 5 +-
gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc | 2 +-
gr-filter/lib/fir_filter.cc | 12 +-
gr-filter/lib/fir_filter_with_buffer.cc | 12 +-
15 files changed, 918 insertions(+), 483 deletions(-)