This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository openjk.
commit 5dd16f65c8206434aff6fd342939439479fcb404
Merge: 90fad7e 8a6ff05
Author: Simon McVittie <s...@debian.org>
Date: Mon Jul 24 07:40:19 2017 +0100
Updated version 0~20170718+dfsg1 from 'upstream/0_20170718+dfsg1'
with Debian dir 3095b2ec27e76541a14149f8aaf2383bca196a0d
.travis.yml | 4 +-
appveyor.yml | 26 +++---
code/cgame/cg_local.h | 4 +-
code/cgame/cg_main.cpp | 2 +-
code/cgame/cg_syscalls.cpp | 2 +-
code/game/g_public.h | 4 +-
code/icarus/IcarusImplementation.cpp | 2 +-
code/qcommon/q_shared.h | 6 --
code/rd-common/tr_public.h | 2 +-
code/ui/ui_public.h | 2 +-
codeJK2/cgame/cg_local.h | 4 +-
codeJK2/cgame/cg_main.cpp | 2 +-
codeJK2/cgame/cg_syscalls.cpp | 2 +-
codeJK2/game/AI_Utils.cpp | 32 -------
codeJK2/game/g_public.h | 2 +-
codemp/botlib/l_precomp.cpp | 6 +-
codemp/cgame/cg_public.h | 2 +-
codemp/cgame/cg_syscalls.c | 4 +-
codemp/client/cl_main.cpp | 4 +
codemp/client/cl_scrn.cpp | 4 +-
codemp/client/client.h | 2 +
codemp/game/NPC_AI_Utils.c | 33 -------
codemp/game/g_public.h | 2 +-
codemp/game/g_syscalls.c | 4 +-
codemp/qcommon/q_shared.h | 8 +-
codemp/rd-common/tr_public.h | 2 +-
codemp/rd-dedicated/G2_API.cpp | 106 ++++++++---------------
codemp/ui/ui_public.h | 2 +-
codemp/ui/ui_shared.h | 2 +-
codemp/ui/ui_syscalls.c | 4 +-
scripts/appveyor/deploy.bat | 20 +++++
scripts/builds/deploy.bat | 8 --
scripts/{travis-build.sh => travis/build.sh} | 0
scripts/{travis-install.sh => travis/install.sh} | 0
shared/qcommon/q_platform.h | 12 +++
shared/sys/sys_main.cpp | 2 +-
shared/sys/sys_win32.cpp | 2 +-
37 files changed, 124 insertions(+), 201 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/openjk.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
