[dhewm3] 02/05: Merge tag 'upstream/0+git20150724+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 702239260c0e1f22d2d47e342bfbc9caf530b25b
Merge: b8b3722 af32cd6
Author: Tobias Frost <tobi at coldtobi.de>
Date:   Sun Sep 13 18:26:41 2015 +0200

    Merge tag 'upstream/0+git20150724+dfsg'
    
    Upstream version 0+git20150724+dfsg
    
    # gpg: Signature made So 13 Sep 2015 18:26:38 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                    |  16 +++
 README.md                    |  41 +-----
 neo/CMakeLists.txt           |   2 -
 neo/renderer/Cinematic.cpp   |   6 +-
 neo/renderer/Image_files.cpp |   6 +-
 neo/sys/doom_icon.h          | 332 +++++++++++++++++++++++++++++++++++++++++++
 neo/sys/glimp.cpp            |  42 +++++-
 7 files changed, 399 insertions(+), 46 deletions(-)

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