[ioquake3] 03/05: Merge tag 'upstream/1.36+u20151017+dfsg1'

[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 e9419fe6cec7e7918a9a7803455874e6455bdecb
Merge: 8467255 6025b17
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Nov 21 17:18:32 2015 +0000

    Merge tag 'upstream/1.36+u20151017+dfsg1'
    
    Upstream version 1.36+u20151017+dfsg1

 Makefile                      |  2 +-
 code/client/cl_main.c         |  2 +-
 code/renderergl1/tr_backend.c |  2 --
 code/renderergl1/tr_cmds.c    | 21 ++++++++++++++++-----
 code/renderergl1/tr_image.c   |  6 ++++--
 code/renderergl1/tr_main.c    | 18 ++++++++++--------
 code/renderergl2/tr_backend.c |  2 --
 code/renderergl2/tr_cmds.c    | 21 ++++++++++++++++-----
 code/renderergl2/tr_main.c    | 18 ++++++++++--------
 9 files changed, 58 insertions(+), 34 deletions(-)

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