[Commit-gnuradio] [gnuradio] 06/06: Merge remote-tracking branch 'drmpeg/dvbs-tx'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit b858d8f2c1351825d2ee3c3b22bef9e274a93cfb
Merge: 056ce0f be09e2f
Author: Johnathan Corgan <address@hidden>
Date:   Tue Dec 29 07:28:47 2015 -0800

    Merge remote-tracking branch 'drmpeg/dvbs-tx'

 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 +-
 8 files changed, 3606 insertions(+), 1616 deletions(-)