This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository ioquake3.
commit 56862de14f133a3e2376cb846e8c1123bb31e690 Merge: a731628 ebf55ca Author: Simon McVittie <[email protected]> Date: Sat Nov 5 18:23:50 2016 +0000 Merge tag 'upstream/1.36+u20161101+dfsg1' into debian/master Upstream version 1.36+u20161101+dfsg1 Makefile | 17 +- code/botlib/aasfile.h | 4 +- code/botlib/be_aas_cluster.c | 2 +- code/client/cl_main.c | 5 +- code/client/snd_wavelet.c | 21 +- code/game/g_main.c | 4 +- code/qcommon/cm_trace.c | 2 +- code/qcommon/common.c | 45 ++-- code/qcommon/files.c | 69 +++-- code/qcommon/q_shared.h | 4 + code/qcommon/qcommon.h | 5 +- code/renderergl2/glsl/lightall_fp.glsl | 3 + code/renderergl2/tr_backend.c | 12 +- code/renderergl2/tr_bsp.c | 232 ++++++++-------- code/renderergl2/tr_curve.c | 8 +- code/renderergl2/tr_extensions.c | 56 ---- code/renderergl2/tr_extramath.c | 20 +- code/renderergl2/tr_extramath.h | 1 + code/renderergl2/tr_flares.c | 38 +-- code/renderergl2/tr_glsl.c | 3 - code/renderergl2/tr_image.c | 472 +++++++++++++++++---------------- code/renderergl2/tr_init.c | 4 - code/renderergl2/tr_light.c | 22 +- code/renderergl2/tr_local.h | 25 +- code/renderergl2/tr_model.c | 14 +- code/renderergl2/tr_model_iqm.c | 14 +- code/renderergl2/tr_shade_calc.c | 4 +- code/renderergl2/tr_shader.c | 16 +- code/renderergl2/tr_surface.c | 68 +++-- code/renderergl2/tr_vbo.c | 85 ++---- code/sys/sys_main.c | 59 ++++- code/ui/ui_main.c | 4 +- misc/nsis/Makefile | 5 +- 33 files changed, 677 insertions(+), 666 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
