This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit aeaad309408161572d04a27fdcdd3b249cc72b27
Merge: 7709223 f9ef5eb
Author: Simon McVittie <s...@debian.org>
Date:   Wed Sep 21 10:44:40 2016 +0100

    Merge tag 'upstream/1.36+u20160914+dfsg1' into debian/master
    
    Upstream version 1.36+u20160914+dfsg1

 Makefile                               |  20 +
 README.md                              |  14 +-
 code/botlib/be_aas_entity.c            |   4 +-
 code/botlib/be_aas_move.c              |   2 +-
 code/botlib/be_aas_reach.c             |   8 +-
 code/botlib/be_ai_move.c               |   2 +-
 code/botlib/l_precomp.c                |   2 +-
 code/client/cl_input.c                 |  24 +-
 code/client/cl_keys.c                  |  27 ++
 code/client/cl_main.c                  |   6 +-
 code/client/keycodes.h                 |  30 ++
 code/game/ai_dmnet.c                   |   3 +-
 code/game/ai_main.c                    |   6 +-
 code/null/null_glimp.c                 |  15 +-
 code/qcommon/msg.c                     |  66 +---
 code/renderercommon/qgl.h              | 371 ++++++------------
 code/renderergl1/tr_world.c            |  10 +-
 code/renderergl2/glsl/lightall_fp.glsl |  29 --
 code/renderergl2/glsl/lightall_vp.glsl |  22 +-
 code/renderergl2/tr_animation.c        |   2 +-
 code/renderergl2/tr_backend.c          |  31 +-
 code/renderergl2/tr_bsp.c              | 308 ++++++---------
 code/renderergl2/tr_curve.c            |  72 ++--
 code/renderergl2/tr_dsa.c              |  84 ++--
 code/renderergl2/tr_dsa.h              |  44 +--
 code/renderergl2/tr_extensions.c       | 687 +++++----------------------------
 code/renderergl2/tr_fbo.c              |  14 +-
 code/renderergl2/tr_glsl.c             | 229 +++++------
 code/renderergl2/tr_image.c            |  59 ++-
 code/renderergl2/tr_init.c             |  14 +-
 code/renderergl2/tr_light.c            |  38 +-
 code/renderergl2/tr_local.h            |  65 ++--
 code/renderergl2/tr_main.c             | 379 ++----------------
 code/renderergl2/tr_marks.c            |  23 +-
 code/renderergl2/tr_model.c            | 101 +++--
 code/renderergl2/tr_model_iqm.c        |  21 +-
 code/renderergl2/tr_postprocess.c      |   4 +-
 code/renderergl2/tr_scene.c            |   6 -
 code/renderergl2/tr_shade.c            |  88 ++---
 code/renderergl2/tr_shade_calc.c       |  24 +-
 code/renderergl2/tr_shader.c           |   8 +-
 code/renderergl2/tr_sky.c              |   2 +-
 code/renderergl2/tr_surface.c          | 425 +++-----------------
 code/renderergl2/tr_vbo.c              | 245 ++++--------
 code/renderergl2/tr_world.c            |  22 +-
 code/sdl/sdl_input.c                   | 251 +++++++++++-
 code/tools/asm/q3asm.c                 |   2 +-
 misc/linux/server_compile.sh           |   2 +-
 opengl2-readme.md                      |  76 ++--
 49 files changed, 1380 insertions(+), 2607 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/ioquake3.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

Reply via email to