[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: |
Mon, 20 Jun 2016 19:02:01 +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 6eecbd89436bd73c903885803653481152403f98
Merge: d7eaf6e 037b34f
Author: Johnathan Corgan <address@hidden>
Date: Mon Jun 20 09:56:09 2016 -0700
Merge branch 'maint'
docs/doxygen/other/stream_tags.dox | 2 +-
gnuradio-runtime/include/gnuradio/block.h | 6 +++---
gnuradio-runtime/lib/tpb_thread_body.cc | 2 +-
gr-analog/include/gnuradio/analog/phase_modulator_fc.h | 2 +-
gr-atsc/lib/qa_atsci_fake_single_viterbi.cc | 3 +--
gr-atsc/lib/qa_atsci_single_viterbi.cc | 4 ++--
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 +-
gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t | 2 +-
gr-blocks/include/gnuradio/blocks/unpack_k_bits.h | 2 +-
gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h | 2 +-
gr-blocks/lib/tagged_file_sink_impl.cc | 2 +-
gr-channels/include/gnuradio/channels/channel_model.h | 2 +-
gr-digital/include/gnuradio/digital/fll_band_edge_cc.h | 2 +-
gr-digital/include/gnuradio/digital/lms_dd_equalizer_cc.h | 2 +-
gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h | 2 +-
gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h | 2 +-
gr-dtv/include/gnuradio/dtv/dvbt_inner_coder.h | 2 +-
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 +-
gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccc.h | 2 +-
gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccf.h | 2 +-
gr-filter/include/gnuradio/filter/pfb_arb_resampler_fff.h | 2 +-
gr-filter/include/gnuradio/filter/pfb_channelizer_ccf.h | 2 +-
gr-filter/include/gnuradio/filter/pfb_decimator_ccf.h | 2 +-
gr-filter/include/gnuradio/filter/pfb_interpolator_ccf.h | 2 +-
gr-filter/include/gnuradio/filter/pfb_synthesizer_ccf.h | 2 +-
gr-filter/include/gnuradio/filter/pm_remez.h | 4 ++--
gr-filter/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 +-
41 files changed, 45 insertions(+), 46 deletions(-)
- [Commit-gnuradio] [gnuradio] branch master updated (d7eaf6e -> 7a14037), git, 2016/06/20
- [Commit-gnuradio] [gnuradio] 02/06: added set_min_output_buffer call, as that seems to be in particular demand, git, 2016/06/20
- [Commit-gnuradio] [gnuradio] 04/06: Merge branch 'maint',
git <=
- [Commit-gnuradio] [gnuradio] 03/06: Fix xml copy and paste error., git, 2016/06/20
- [Commit-gnuradio] [gnuradio] 05/06: Merge remote-tracking branch 'drmpeg/ldpc-vlsnr', git, 2016/06/20
- [Commit-gnuradio] [gnuradio] 06/06: Merge remote-tracking branch 'mmueller/block_gateway_add_minimum_output_buffer', git, 2016/06/20
- [Commit-gnuradio] [gnuradio] 01/06: Add DVB-S2X VL-SNR code rates for AMSAT., git, 2016/06/20