[dhewm3] 07/13: Merge tag 'upstream/0+git20150226+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 70d1147635d27a2674534eac6f6f4ed36bb33c73
Merge: b48f767 acfb03d
Author: Tobias Frost <tobi at coldtobi.de>
Date:   Thu Mar 12 09:33:54 2015 +0100

    Merge tag 'upstream/0+git20150226+dfsg'
    
    Upstream version 0+git20150226+dfsg
    
    # gpg: Unterschrift vom Do 12 Mär 2015 09:33:53 CET mittels RSA-Schlüssel ID 17BD5D36
    # gpg: Korrekte Unterschrift von "Tobias Frost <tobi at coldtobi.de>"
    # gpg:                     alias "Tobias Frost <tobi at frost.de>"
    # gpg:                     alias "[jpeg image of size 5939]"
    # gpg:                     alias "Tobias Frost <tobi at debian.org>"

 ChangeLog                        |  8 ++++
 neo/d3xp/gamesys/SysCvar.cpp     |  2 +-
 neo/d3xp/physics/Physics_AF.cpp  |  4 +-
 neo/framework/DeclAF.cpp         |  2 +-
 neo/game/gamesys/SysCvar.cpp     |  2 +-
 neo/game/physics/Physics_AF.cpp  |  4 +-
 neo/idlib/Lexer.cpp              |  2 +-
 neo/idlib/Parser.cpp             |  2 +-
 neo/renderer/jpeg_memory_src.cpp | 93 ----------------------------------------
 neo/renderer/jpeg_memory_src.h   | 24 -----------
 10 files changed, 17 insertions(+), 126 deletions(-)

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