[prboom+] 03/03: Merge tag 'upstream/2.5.1.4_svn4429+dfsg1'

[Fabian Greffrath]

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

fabian pushed a commit to branch master
in repository prboom+.

commit 8ca80700b457d649d39ee2ba71b7a90383c73e05
Merge: 1d22d6f 5923d75
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Thu Jul 9 09:16:00 2015 +0200

    Merge tag 'upstream/2.5.1.4_svn4429+dfsg1'
    
    Upstream version 2.5.1.4~svn4429+dfsg1

 src/p_setup.c | 2 ++
 src/r_defs.h  | 3 ++-
 src/r_segs.c  | 8 +-------
 src/w_wad.c   | 6 ------
 4 files changed, 5 insertions(+), 14 deletions(-)

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