This is an automated email from the git hooks/post-receive script. fabian-guest pushed a commit to branch master in repository prboom+.
commit 57fa742e3f7c4779010240c611f0cb49039d303a Merge: a06ccef c7884cb Author: Fabian Greffrath <[email protected]> Date: Thu Mar 26 13:51:39 2015 +0100 Merge tag 'upstream/2.5.1.4_svn4425+dfsg1' Upstream version 2.5.1.4~svn4425+dfsg1 data/lumps/glfp.lmp | 3 ++- src/MUSIC/flplayer.c | 3 +++ src/SDL/i_sound.c | 2 ++ src/am_map.c | 8 +++---- src/i_sound.h | 2 ++ src/m_misc.c | 2 ++ src/r_main.c | 4 ++-- src/r_main.h | 2 +- src/r_plane.c | 64 +++++++++++----------------------------------------- src/r_segs.c | 26 ++++++++++----------- src/r_things.c | 6 ++--- 11 files changed, 47 insertions(+), 75 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/prboom+.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

