This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository openjk.
commit 5ad7d4198dd25755e3bd14559f17db4c4b997f7a Merge: b2b64ff 72b4878 Author: Simon McVittie <[email protected]> Date: Tue Mar 14 09:39:43 2017 +0000 Merge tag 'upstream/0_20170314+dfsg1' into debian/master Upstream version 0~20170314+dfsg1 appveyor.yml | 29 ++++++++------ code/client/cl_main.cpp | 2 +- code/game/Q3_Interface.h | 98 ++++++++++++++++++++++----------------------- code/game/g_svcmds.cpp | 8 +--- code/qcommon/common.cpp | 6 +++ code/qcommon/files.cpp | 8 ++++ codemp/client/cl_main.cpp | 2 +- codemp/qcommon/common.cpp | 6 +++ codemp/qcommon/files.cpp | 8 ++++ shared/qcommon/q_platform.h | 2 + shared/sys/sys_main.cpp | 7 ++++ 11 files changed, 106 insertions(+), 70 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

