[prboom+] 03/03: Merge tag 'upstream/2.5.1.4_svn4449+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 3e29ff7b386adb5470ef0def4d2584308340a7b7
Merge: 07e2b01 b6f69c5
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Mon Oct 12 13:46:00 2015 +0200

    Merge tag 'upstream/2.5.1.4_svn4449+dfsg1'
    
    Upstream version 2.5.1.4~svn4449+dfsg1

 src/d_main.c  | 15 +++++-----
 src/r_patch.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 80 insertions(+), 29 deletions(-)

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