[ioquake3] 02/04: Merge tag 'upstream/1.36+u20150412+dfsg1' into debian-experimental

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository ioquake3.

commit 85b2ca94fe66886915a98f4d2ceb9e128dcaf589
Merge: 9887074 fe3418c
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Apr 29 09:30:33 2015 +0100

    Merge tag 'upstream/1.36+u20150412+dfsg1' into debian-experimental
    
    Upstream version 1.36+u20150412+dfsg1

 Makefile                        |  9 ++++-----
 code/cgame/cg_draw.c            | 21 +++++++++++----------
 code/game/ai_dmq3.c             |  1 +
 code/qcommon/common.c           |  2 +-
 code/qcommon/unzip.c            |  6 ++++++
 code/qcommon/vm_x86.c           |  7 ++++---
 code/renderergl1/tr_animation.c |  2 +-
 code/renderergl2/tr_animation.c |  2 +-
 code/renderergl2/tr_backend.c   | 17 ++---------------
 code/renderergl2/tr_extramath.c |  2 +-
 code/renderergl2/tr_image.c     |  2 +-
 code/renderergl2/tr_shade.c     | 30 +++++++++++++++++++-----------
 12 files changed, 52 insertions(+), 49 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git