[prboom+] 02/09: Merge tag 'upstream/2.5.1.4_svn4453+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 8c74fd9f5043402179a382f5f831410e1d5f8c2e
Merge: a493cbd cde5891
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Tue Oct 27 14:48:13 2015 +0100

    Merge tag 'upstream/2.5.1.4_svn4453+dfsg1'
    
    Upstream version 2.5.1.4~svn4453+dfsg1

 ICONS/Makefile.am      |  2 +-
 ICONS/prboom-plus.bash | 38 ++++++++++++++++++++++++++++++++++++++
 src/MUSIC/flplayer.c   |  5 ++++-
 src/d_event.h          |  1 +
 src/g_game.c           |  9 +++++++++
 src/g_game.h           |  1 +
 src/gl_main.c          |  6 +++---
 src/gl_struct.h        |  2 +-
 src/m_menu.c           |  6 ++----
 src/r_things.c         | 31 ++++++++++++++++---------------
 10 files changed, 76 insertions(+), 25 deletions(-)

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