[rbdoom3bfg] 02/03: Merge tag 'upstream/1.0.3+repack1+git20151124'

[Tobias Frost]

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

tobi pushed a commit to branch master
in repository rbdoom3bfg.

commit 410dd5f83194fc3cc0122b9260aa8ea1a383fca1
Merge: f599d90 c792688
Author: Tobias Frost <tobi at coldtobi.de>
Date:   Tue Nov 24 19:40:42 2015 +0100

    Merge tag 'upstream/1.0.3+repack1+git20151124'
    
    Upstream version 1.0.3+repack1+git20151124
    
    # gpg: Unterschrift vom Di 24 Nov 2015 19:40:39 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                          |  16 ++++
 base/default.cfg                   | 152 ++++++++++++++++++-------------------
 neo/renderer/RenderProgs_GLSL.cpp  |   7 ++
 neo/renderer/RenderSystem.cpp      |   2 +-
 neo/renderer/RenderSystem.h        |   1 +
 neo/renderer/RenderSystem_init.cpp |  75 +++++++++++++-----
 6 files changed, 156 insertions(+), 97 deletions(-)

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