[prboom+] 03/03: Merge tag 'upstream/2.5.1.4_svn4433+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 efcedd81554a1e287a5695a6da8e0511afe9e5c0
Merge: 7cd6fb4 f79467e
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Sun Sep 13 13:12:23 2015 +0200

    Merge tag 'upstream/2.5.1.4_svn4433+dfsg1'
    
    Upstream version 2.5.1.4~svn4433+dfsg1

 src/p_setup.c |  10 ++++
 src/r_patch.c | 186 +++++++++++++++++++++++++++-------------------------------
 2 files changed, 98 insertions(+), 98 deletions(-)

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