This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository openjk.
commit e74be6da53c6dab5e8efbf37722036da62cd7404 Merge: ebabfc0 d433c09 Author: Simon McVittie <[email protected]> Date: Sat Jan 21 15:29:34 2017 +0000 Merge tag 'upstream/0_20170112+dfsg1' into debian/master Upstream version 0~20170112+dfsg1 appveyor.yml | 10 +++------- code/client/cl_cin.cpp | 28 ++++++++++++++++++++++++---- code/game/G_Timer.cpp | 17 ++++++++++++----- code/game/Q3_Interface.cpp | 15 +++++++++++++++ code/game/g_client.cpp | 36 ++++++++++++++++++++---------------- code/game/g_roff.cpp | 3 +++ code/game/g_session.cpp | 4 +++- code/game/g_svcmds.cpp | 2 +- code/icarus/IcarusImplementation.cpp | 34 ++++++++++++++++++++++++---------- code/rd-vanilla/tr_init.cpp | 5 +++-- code/server/sv_snapshot.cpp | 2 ++ codeJK2/game/Q3_Registers.cpp | 15 +++++++++++++++ codeJK2/game/g_client.cpp | 4 +++- codeJK2/game/g_roff.cpp | 5 +++++ codemp/client/cl_cin.cpp | 28 ++++++++++++++++++++++++---- codemp/game/NPC_move.c | 4 ++-- codemp/game/bg_pmove.c | 2 +- codemp/rd-vanilla/tr_init.cpp | 5 +++-- shared/qcommon/q_platform.h | 6 +----- 19 files changed, 164 insertions(+), 61 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
