[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5 |
|
Date: |
Tue, 29 Dec 2015 15:49:37 +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 d0b9dcf1ad2673b8de253af12c4a089243e5b981
Merge: 9561b17 d3cbf64
Author: Johnathan Corgan <address@hidden>
Date: Tue Dec 29 07:41:18 2015 -0800
Merge branch 'next' into next-qt5
cmake/Modules/GrPlatform.cmake | 6 +-
cmake/Packaging/Fedora-15.cmake | 3 +-
cmake/Packaging/Fedora-16.cmake | 3 +-
cmake/Packaging/Fedora-17.cmake | 1 +
cmake/Packaging/Fedora-18.cmake | 1 +
cmake/Packaging/Ubuntu-10.04.cmake | 1 +
cmake/Packaging/Ubuntu-10.10.cmake | 1 +
cmake/Packaging/Ubuntu-11.04.cmake | 1 +
cmake/Packaging/Ubuntu-11.10.cmake | 1 +
cmake/Packaging/Ubuntu-12.04.cmake | 1 +
cmake/Packaging/Ubuntu-12.10.cmake | 1 +
cmake/Packaging/Ubuntu-13.04.cmake | 1 +
docs/doxygen/other/build_guide.dox | 1 +
gr-dtv/examples/README.dvbs | 26 +
gr-dtv/examples/dvbs2_tx.grc | 2516 +++++++++++++-------
gr-dtv/examples/{dvbs2_tx.grc => dvbs_tx.grc} | 2449 +++++++++++++------
gr-dtv/grc/dtv_dvbs2_modulator_bc.xml | 17 +-
gr-dtv/include/gnuradio/dtv/dvbs2_config.h | 6 +
gr-dtv/include/gnuradio/dtv/dvbs2_modulator_bc.h | 3 +-
gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc | 202 +-
gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.h | 3 +-
gr-utils/CMakeLists.txt | 10 +
gr-utils/python/modtool/__init__.py | 3 +-
gr-utils/python/modtool/code_generator.py | 60 +-
.../gr-newmod/cmake/Modules/GrPlatform.cmake | 6 +-
gr-utils/python/modtool/modtool_add.py | 32 +-
gr-utils/python/modtool/modtool_rename.py | 3 -
gr-utils/python/modtool/templates.py | 546 +++--
28 files changed, 3940 insertions(+), 1964 deletions(-)