[Commit-gnuradio] [gnuradio] 03/04: Merge branch 'master' into next

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch next
in repository gnuradio.

commit 00eeada1d9ff6f680dd7fb75266ca4643c105381
Merge: 3ec66e9 b858d8f
Author: Johnathan Corgan <address@hidden>
Date:   Tue Dec 29 07:32:59 2015 -0800

    Merge branch 'master' into next

 cmake/Modules/GrPlatform.cmake                     |    6 +-
 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-newmod/cmake/Modules/GrPlatform.cmake       |    6 +-
 10 files changed, 3612 insertions(+), 1622 deletions(-)