[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, 20 Jun 2016 19:02:02 +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 09d8b895447b1507b80a27053b51361ea1684175
Merge: 090103c 7a14037
Author: Johnathan Corgan <address@hidden>
Date: Mon Jun 20 10:19:13 2016 -0700
Merge branch 'master' into next
Conflicts:
gr-atsc/lib/qa_atsci_fake_single_viterbi.cc
gr-atsc/lib/qa_atsci_single_viterbi.cc
docs/doxygen/other/stream_tags.dox | 2 +-
gnuradio-runtime/include/gnuradio/block.h | 6 +-
gnuradio-runtime/include/gnuradio/block_gateway.h | 8 +
gnuradio-runtime/lib/tpb_thread_body.cc | 2 +-
.../include/gnuradio/analog/phase_modulator_fc.h | 2 +-
gr-audio/lib/osx/osx_source.cc | 2 +-
gr-blocks/include/gnuradio/blocks/endian_swap.h | 2 +-
gr-blocks/include/gnuradio/blocks/pack_k_bits.h | 2 +-
gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h | 2 +-
.../include/gnuradio/blocks/peak_detector_XX.h.t | 2 +-
gr-blocks/include/gnuradio/blocks/unpack_k_bits.h | 2 +-
.../include/gnuradio/blocks/unpack_k_bits_bb.h | 2 +-
gr-blocks/lib/tagged_file_sink_impl.cc | 2 +-
.../include/gnuradio/channels/channel_model.h | 2 +-
.../include/gnuradio/digital/fll_band_edge_cc.h | 2 +-
.../include/gnuradio/digital/lms_dd_equalizer_cc.h | 2 +-
.../include/gnuradio/digital/pfb_clock_sync_ccf.h | 2 +-
.../include/gnuradio/digital/pfb_clock_sync_fff.h | 2 +-
gr-dtv/grc/dtv_dvb_bbheader_bb.xml | 113 +++++++-
gr-dtv/grc/dtv_dvb_bbscrambler_bb.xml | 109 +++++++-
gr-dtv/grc/dtv_dvb_bch_bb.xml | 109 +++++++-
gr-dtv/grc/dtv_dvb_ldpc_bb.xml | 109 +++++++-
gr-dtv/include/gnuradio/dtv/dvb_bbheader_bb.h | 4 +-
gr-dtv/include/gnuradio/dtv/dvb_bbscrambler_bb.h | 4 +-
gr-dtv/include/gnuradio/dtv/dvb_bch_bb.h | 4 +-
gr-dtv/include/gnuradio/dtv/dvb_config.h | 12 +-
gr-dtv/include/gnuradio/dtv/dvb_ldpc_bb.h | 6 +-
gr-dtv/include/gnuradio/dtv/dvbt_inner_coder.h | 2 +-
gr-dtv/lib/dvb/dvb_bbheader_bb_impl.cc | 181 +++++++++----
gr-dtv/lib/dvb/dvb_bbheader_bb_impl.h | 7 +-
gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.cc | 38 ++-
gr-dtv/lib/dvb/dvb_bch_bb_impl.cc | 112 +++++++-
gr-dtv/lib/dvb/dvb_bch_bb_impl.h | 3 +-
gr-dtv/lib/dvb/dvb_defines.h | 4 +-
gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc | 289 ++++++++++++++++++++-
gr-dtv/lib/dvb/dvb_ldpc_bb_impl.h | 13 +-
gr-fec/include/gnuradio/fec/async_decoder.h | 2 +-
gr-fec/include/gnuradio/fec/async_encoder.h | 2 +-
gr-fec/include/gnuradio/fec/ber_bf.h | 2 +-
gr-fec/include/gnuradio/fec/tagged_decoder.h | 2 +-
gr-fec/include/gnuradio/fec/tagged_encoder.h | 2 +-
gr-filter/include/gnuradio/filter/fft_filter_ccc.h | 2 +-
gr-filter/include/gnuradio/filter/fft_filter_ccf.h | 2 +-
gr-filter/include/gnuradio/filter/fft_filter_fff.h | 2 +-
.../gnuradio/filter/pfb_arb_resampler_ccc.h | 2 +-
.../gnuradio/filter/pfb_arb_resampler_ccf.h | 2 +-
.../gnuradio/filter/pfb_arb_resampler_fff.h | 2 +-
.../include/gnuradio/filter/pfb_channelizer_ccf.h | 2 +-
.../include/gnuradio/filter/pfb_decimator_ccf.h | 2 +-
.../include/gnuradio/filter/pfb_interpolator_ccf.h | 2 +-
.../include/gnuradio/filter/pfb_synthesizer_ccf.h | 2 +-
gr-filter/include/gnuradio/filter/pm_remez.h | 4 +-
.../include/gnuradio/filter/polyphase_filterbank.h | 2 +-
gr-filter/lib/pm_remez.cc | 2 +-
gr-uhd/include/gnuradio/uhd/usrp_block.h | 2 +-
gr-utils/python/utils/gr_plot_qt | 2 +-
grc/gui/FileDialogs.py | 2 +-
57 files changed, 1051 insertions(+), 158 deletions(-)