[prboom+] 03/03: Merge tag 'upstream/2.5.1.4_svn4441+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 f35b7334fb7aa0f04d224ed6382e13de46a93b1e
Merge: be65961 5bcca63
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Fri Sep 25 20:33:18 2015 +0200

    Merge tag 'upstream/2.5.1.4_svn4441+dfsg1'
    
    Upstream version 2.5.1.4~svn4441+dfsg1

 VisualC6/Doom.dsp    |   8 --
 VisualC8/Doom.vcproj |   8 --
 src/MAC/Rakefile     |   1 -
 src/Makefile.am      |   2 +-
 src/SDL/i_video.c    |   6 -
 src/doomstat.h       |   1 +
 src/e6y.c            |  36 +-----
 src/e6y.h            |   1 -
 src/gl_detail.c      |  12 +-
 src/gl_main.c        |  19 ++-
 src/gl_struct.h      |   1 -
 src/gl_vertex.c      |   4 +-
 src/i_smp.c          | 318 ---------------------------------------------------
 src/i_smp.h          |  66 -----------
 src/m_fixed.h        |   5 +
 src/m_menu.c         |  10 +-
 src/m_misc.c         |   8 +-
 src/p_floor.c        |   3 +-
 src/p_mobj.c         |   3 +
 src/p_pspr.c         |   4 +
 src/p_setup.c        |   8 +-
 src/r_bsp.c          |   8 +-
 src/r_defs.h         |   2 -
 src/r_draw.h         |   1 -
 src/r_fps.c          |  13 +--
 src/r_main.c         | 116 +++++--------------
 src/r_main.h         |  12 +-
 src/r_plane.c        |   7 +-
 src/r_segs.c         |  23 ++--
 src/r_things.c       |   2 +-
 src/tables.c         |  12 +-
 src/tables.h         |   4 +-
 src/v_video.c        |   7 +-
 33 files changed, 111 insertions(+), 620 deletions(-)

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