[ioquake3] 03/10: Merge tag 'upstream/1.36+u20150730+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 ccf98f5b6b132d570b64c23e834259707d633691
Merge: ed81ac0 0fd7b95
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Aug 1 23:20:46 2015 +0100

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

 Makefile                    | 31 ++++++----------------
 code/cgame/cg_servercmds.c  |  2 +-
 code/client/cl_curl.c       | 63 +++++++++++++++++++++++++++++++++------------
 code/client/cl_main.c       |  7 +----
 code/game/bg_pmove.c        |  4 +--
 code/qcommon/cm_patch.c     | 14 ++++++++--
 code/qcommon/files.c        |  4 ++-
 code/qcommon/q_platform.h   | 35 ++++---------------------
 code/qcommon/vm_x86.c       | 20 +++++++++-----
 code/renderergl1/tr_image.c |  4 +--
 code/renderergl1/tr_light.c |  6 +++++
 code/renderergl2/tr_fbo.c   |  3 ---
 code/renderergl2/tr_image.c |  4 +--
 code/renderergl2/tr_light.c | 10 +++----
 code/sdl/sdl_gamma.c        |  5 +++-
 code/sdl/sdl_glimp.c        | 24 +++++++++++++----
 code/sdl/sdl_input.c        | 10 +++----
 code/sdl/sdl_snd.c          |  2 +-
 code/ui/ui_main.c           | 12 +++++----
 make-macosx-app.sh          |  2 +-
 20 files changed, 143 insertions(+), 119 deletions(-)

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