[Commit-gnuradio] [gnuradio] 43/43: Merge remote-tracking branch 'michaelld/fixes_for_std_complex'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 3061e4797af6d308c1f65efca3444923e6beb4fe
Merge: d3a6160 094c890
Author: Johnathan Corgan <address@hidden>
Date:   Thu Apr 2 12:09:34 2015 -0700

    Merge remote-tracking branch 'michaelld/fixes_for_std_complex'

 gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc      | 3828 ++++++++--------------
 gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc       |   59 +-
 gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.h        |    2 +-
 gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc    |  277 +-
 gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.h     |    2 +-
 gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.cc           |   12 +-
 gr-dtv/lib/dvbt2/dvbt2_modulator_bc_impl.cc      | 1104 +++----
 gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc    |   13 +-
 gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc         |   51 +-
 gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc |  208 +-
 10 files changed, 1860 insertions(+), 3696 deletions(-)