[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'next' into next-qt5
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'next' into next-qt5 |
Date: |
Mon, 1 Aug 2016 21:59:00 +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 5dc4b7b69c343ad2164704972ab8cb4ba494cb1b
Merge: 4c961d0 edbcd29
Author: Johnathan Corgan <address@hidden>
Date: Mon Aug 1 14:44:53 2016 -0700
Merge branch 'next' into next-qt5
CMakeLists.txt | 4 +-
cmake/Modules/GrVersion.cmake | 21 +-
docs/sphinx/source/blocks_blocks.rst | 1 +
docs/sphinx/source/index.rst | 1 +
gnuradio-runtime/lib/prefs.cc | 3 +-
gr-blocks/grc/blocks_block_tree.xml | 1 +
gr-blocks/grc/blocks_tcp_server_sink.xml | 77 +
gr-blocks/include/gnuradio/blocks/CMakeLists.txt | 1 +
.../include/gnuradio/blocks/tcp_server_sink.h | 66 +
gr-blocks/lib/CMakeLists.txt | 1 +
gr-blocks/lib/tcp_server_sink_impl.cc | 161 +
gr-blocks/lib/tcp_server_sink_impl.h | 73 +
gr-blocks/python/blocks/qa_tcp_server_sink.py | 87 +
gr-blocks/swig/blocks_swig5.i | 3 +
gr-dtv/examples/README.atsc | 7 +
gr-dtv/examples/file_atsc_tx.grc | 1015 ++++---
gr-dtv/examples/uhd_atsc_tx.grc | 3166 ++++++++++++++++++++
gr-dtv/grc/dtv_dvbs2_modulator_bc.xml | 29 +-
gr-dtv/include/gnuradio/dtv/dvb_config.h | 1 +
gr-dtv/lib/CMakeLists.txt | 18 -
gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.cc | 2 +-
gr-dtv/lib/atsc/atsc_viterbi_mux.h | 2539 ++++++++++++++++
gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc | 11 +
gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.cc | 5 +-
gr-uhd/apps/uhd_app.py | 35 +-
gr-uhd/apps/uhd_fft | 58 +-
gr-uhd/apps/uhd_siggen_base.py | 94 +-
gr-uhd/apps/uhd_siggen_gui | 33 +-
gr-uhd/lib/usrp_source_impl.cc | 1 +
29 files changed, 7032 insertions(+), 482 deletions(-)