[prboom+] 03/04: Merge tag 'upstream/2.5.1.4_svn4457+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 b8397a06eaad086200968fde38d92487a1fb939e
Merge: e1d6d22 6323d07
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Mon Nov 30 06:54:47 2015 +0100

    Merge tag 'upstream/2.5.1.4_svn4457+dfsg1'
    
    Upstream version 2.5.1.4~svn4457+dfsg1

 ICONS/prboom-plus.bash | 43 ++++++++++++++++++++++++++++---------------
 src/m_menu.c           |  2 +-
 src/p_setup.c          |  8 ++++----
 src/r_defs.h           |  2 +-
 src/r_main.c           | 15 ++++++++++-----
 src/r_main.h           |  1 +
 6 files changed, 45 insertions(+), 26 deletions(-)

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