[spring] 04/06: Merge tag 'upstream/103.0+dfsg'

[Markus Koschany]

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

apo pushed a commit to branch master
in repository spring.

commit c55cff7606b7f1b02752f971aedacfcf03a531be
Merge: 288abee c254b14
Author: Markus Koschany <apo at debian.org>
Date:   Sat Jul 23 22:22:10 2016 +0200

    Merge tag 'upstream/103.0+dfsg'
    
    Upstream version 103.0+dfsg
    
    # gpg: Signature made Sat 23 Jul 2016 22:22:04 CEST using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 AI/Skirmish/HughAI/README                        |   4 +-
 AI/Skirmish/HughAI/data/AIInfo.lua               |   2 +-
 AI/Skirmish/KAIK/data/AIInfo.lua                 |   2 +-
 VERSION                                          |   2 +-
 buildbot/slave/win/make_installer.sh             |   2 +-
 doc/changelog.txt                                |  18 +++
 doc/releasechecklist.txt                         |   9 +-
 rts/Game/Game.cpp                                |   7 ++
 rts/Game/GameHelper.cpp                          |  10 +-
 rts/Game/GameHelper.h                            |   1 +
 rts/Game/PreGame.cpp                             |   2 +-
 rts/Game/SyncedGameCommands.cpp                  |   5 +-
 rts/Game/UnsyncedGameCommands.cpp                |   5 +-
 rts/Lua/LuaArchive.cpp                           |   4 +-
 rts/Lua/LuaSyncedCtrl.cpp                        |  23 ++++
 rts/Lua/LuaSyncedCtrl.h                          |   2 +
 rts/Rendering/Env/Particles/ProjectileDrawer.cpp |  10 +-
 rts/Rendering/FeatureDrawer.cpp                  |  10 +-
 rts/Rendering/Textures/S3OTextureHandler.cpp     |   2 +-
 rts/Rendering/UnitDrawer.cpp                     | 142 +++++++++++++----------
 rts/Rendering/UnitDrawer.h                       |   6 +-
 rts/Sim/CMakeLists.txt                           |   1 +
 rts/Sim/Misc/BuildingMaskMap.cpp                 |  33 ++++++
 rts/Sim/Misc/BuildingMaskMap.h                   |  37 ++++++
 rts/Sim/Misc/ModInfo.cpp                         |   3 +
 rts/Sim/Misc/ModInfo.h                           |   2 +
 rts/Sim/MoveTypes/GroundMoveType.cpp             |   5 +-
 rts/Sim/MoveTypes/MoveDefHandler.cpp             |  11 +-
 rts/Sim/MoveTypes/MoveMath/MoveMath.cpp          |  34 +++++-
 rts/Sim/MoveTypes/MoveMath/MoveMath.h            |   1 +
 rts/Sim/Units/UnitDef.cpp                        |   1 +
 rts/Sim/Units/UnitDef.h                          |   3 +
 rts/System/TimeProfiler.cpp                      |   4 +
 33 files changed, 304 insertions(+), 99 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/spring.git