[ioquake3] 02/05: Merge tag 'upstream/1.36+u20150710+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 2cc8d1d8930183f1d746bdd18d15d13f1f88b68f
Merge: f0aed34 fd9f290
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Jul 12 22:23:09 2015 +0100

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

 Makefile                                |  77 +++++++++++---------
 code/asm/snapvector.asm                 |   4 -
 code/botlib/l_precomp.c                 |   6 +-
 code/cgame/cg_event.c                   |  23 +++---
 code/cgame/cg_servercmds.c              |  12 +--
 code/client/cl_avi.c                    |  11 ---
 code/client/cl_cin.c                    |   4 +-
 code/client/cl_input.c                  |   4 +-
 code/client/cl_main.c                   |  19 +----
 code/game/ai_main.c                     |  12 ++-
 code/qcommon/q_platform.h               |   8 +-
 code/qcommon/q_shared.c                 |   2 +-
 code/renderercommon/tr_common.h         |  14 ++++
 code/renderergl1/tr_light.c             |   2 +-
 code/renderergl1/tr_local.h             |  14 ----
 code/renderergl1/tr_main.c              |   4 +
 code/renderergl1/tr_shader.c            |  17 +++++
 code/renderergl2/tr_light.c             |   4 +-
 code/renderergl2/tr_local.h             |  14 ----
 code/renderergl2/tr_main.c              |   4 +
 code/renderergl2/tr_shader.c            |  17 +++++
 code/sdl/sdl_glimp.c                    |  18 ++++-
 code/sdl/sdl_input.c                    |   2 +-
 code/sys/sys_unix.c                     |   2 +-
 code/sys/sys_win32.c                    |  11 +++
 misc/linux/server_compile.sh            |  30 ++++++++
 misc/linux/start_server.sh              |   3 +
 opengl2-readme.txt => opengl2-readme.md | 125 ++++++++++++++++----------------
 28 files changed, 266 insertions(+), 197 deletions(-)

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