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

[Fabian Greffrath]

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

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

commit d1659ef334bfb60e18794454f1aa46c79e5ca85e
Merge: 29b3c8a 2c4ea94
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Thu Feb 19 15:05:59 2015 +0100

    Merge tag 'upstream/2.5.1.4_svn4417+dfsg1'
    
    Upstream version 2.5.1.4~svn4417+dfsg1

 src/SDL/i_joy.c   |  4 ++--
 src/SDL/i_sound.c |  1 -
 src/am_map.c      |  7 +------
 src/g_overflow.c  |  2 ++
 src/g_overflow.h  |  5 +++--
 src/hu_lib.c      | 19 +++++++++++++++----
 src/hu_stuff.c    |  9 ++++++++-
 src/m_menu.c      |  2 +-
 src/p_setup.c     | 41 ++++++++++++++++++++++++++++++++++-------
 src/r_defs.h      |  8 ++++++++
 src/r_main.c      |  2 +-
 src/r_segs.c      | 19 +++++++++++++------
 src/r_things.c    | 10 +++++-----
 src/r_things.h    |  2 +-
 14 files changed, 94 insertions(+), 37 deletions(-)

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