This is an automated email from the git hooks/post-receive script. fabian pushed a commit to branch master in repository prboom+.
commit b83b643f4e5a5d9373d5d99d4ecc872ea229210f Merge: 5b3487b 40ae0ed Author: Fabian Greffrath <[email protected]> Date: Sun Jan 24 17:38:01 2016 +0100 Merge tag 'upstream/2.5.1.5_svn4462+dfsg1' Upstream version 2.5.1.5~svn4462+dfsg1 INSTALL | 2 +- README | 2 +- VisualC6/config.h | 2 +- VisualC8/config.h | 2 +- configure.ac | 2 +- doc/prboom-plus-history.html | 41 +++++++++++++++++++++++++++++++++++++++++ doc/prboom-plus-history.txt | 38 ++++++++++++++++++++++++++++++++++++++ src/MAC/config.h | 2 +- src/d_client.c | 4 +--- src/d_main.c | 33 ++++++++++++++++++++++++--------- src/d_main.h | 3 ++- src/gl_gamma.c | 3 +++ src/i_capture.c | 13 +++++++++---- src/i_capture.h | 2 ++ src/m_misc.c | 7 ++++--- src/r_fps.c | 20 ++++++++++++-------- src/r_fps.h | 3 ++- 17 files changed, 144 insertions(+), 35 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
