[openjk] 13/15: Merge tag 'upstream/0_20170610+dfsg1' into debian/master
Simon McVittie
smcv at debian.org
Thu Jun 15 10:28:41 UTC 2017
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository openjk.
commit dd734adf50400075e742a6cc943855b9ee4f0835
Merge: 627c688 a586cff
Author: Simon McVittie <smcv at debian.org>
Date: Thu Jun 15 09:08:37 2017 +0100
Merge tag 'upstream/0_20170610+dfsg1' into debian/master
Upstream version 0~20170610+dfsg1
appveyor.yml | 5 +-
code/client/snd_music.cpp | 2 +-
codemp/cgame/cg_main.c | 4 --
codemp/client/cl_cgame.cpp | 5 ++
codemp/client/cl_main.cpp | 18 ++++--
codemp/server/server.h | 4 ++
codemp/server/sv_challenge.cpp | 8 ++-
codemp/server/sv_client.cpp | 63 ++++++++++++-------
codemp/server/sv_init.cpp | 10 +++
codemp/server/sv_main.cpp | 135 ++++++++++++++++++++++++++++++++++-------
codemp/server/sv_snapshot.cpp | 9 +++
scripts/builds/all.bat | 4 ++
scripts/builds/build.bat | 1 +
scripts/builds/compress.bat | 1 +
scripts/builds/deploy.bat | 8 +++
scripts/builds/install.bat | 1 +
scripts/builds/make.bat | 1 +
scripts/travis-build.sh | 48 +++++++++++++++
scripts/travis-install.sh | 52 ++++++++++++++++
shared/sys/sys_event.cpp | 71 ++++++++++++++--------
shared/sys/sys_public.h | 3 +-
21 files changed, 370 insertions(+), 83 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git
More information about the Pkg-games-commits
mailing list