[dhewm3] 02/02: Merge tag 'upstream/0+git20151005+dfsg'

[Tobias Frost]

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

tobi pushed a commit to branch master
in repository dhewm3.

commit a942aadbdcae35034a4625c2f66928282c35ee24
Merge: a2c76e8 8c38a45
Author: Tobias Frost <tobi at coldtobi.de>
Date:   Mon Oct 5 19:39:45 2015 +0200

    Merge tag 'upstream/0+git20151005+dfsg'
    
    Upstream version 0+git20151005+dfsg
    
    # gpg: Signature made Mo 05 Okt 2015 19:39:42 CEST using RSA key ID 17BD5D36
    # gpg: Good signature from "Tobias Frost <tobi at coldtobi.de>"
    # gpg:                 aka "Tobias Frost <tobi at frost.de>"
    # gpg:                 aka "[jpeg image of size 5939]"
    # gpg:                 aka "Tobias Frost <tobi at debian.org>"

 ChangeLog                             | 80 +++++++++++++++++++++++++++++++++++
 README.md                             | 54 +++++++----------------
 neo/CMakeLists.txt                    | 79 +++++++++++++++++++---------------
 neo/d3xp/Game_local.cpp               |  9 +++-
 neo/framework/BuildDefines.h          |  2 +-
 neo/framework/Console.cpp             | 14 ++++--
 neo/framework/Licensee.h              |  2 +-
 neo/framework/Session.cpp             |  4 +-
 neo/game/Game_local.cpp               |  9 +++-
 neo/idlib/Parser.cpp                  |  6 +--
 neo/renderer/RenderSystem_init.cpp    | 56 ++++++++++++++++++++++--
 neo/sound/snd_efxfile.cpp             |  2 +-
 neo/sound/snd_system.cpp              |  2 +-
 neo/sys/events.cpp                    | 54 +++++++++++++----------
 neo/sys/linux/main.cpp                |  6 ++-
 neo/sys/posix/posix_main.cpp          |  4 +-
 neo/tools/compilers/dmap/optimize.cpp |  4 +-
 neo/ui/ChoiceWindow.cpp               | 14 ++++++
 neo/ui/UserInterface.cpp              | 19 ++++++++-
 neo/ui/Window.cpp                     |  2 +-
 20 files changed, 304 insertions(+), 118 deletions(-)

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