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

[Simon McVittie]

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

smcv pushed a commit to branch debian-experimental
in repository ioquake3.

commit 0e86884d50322f43ab3d7701266687d621c60019
Merge: d29d782 3c1073c
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Mar 12 21:45:03 2015 +0000

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

 Makefile                     |  9 ++++++
 code/cgame/cg_consolecmds.c  |  2 +-
 code/client/snd_openal.c     |  2 +-
 code/game/ai_main.c          |  3 +-
 code/renderergl1/tr_shader.c |  2 +-
 code/renderergl2/tr_fbo.c    |  3 --
 code/renderergl2/tr_shader.c |  2 +-
 code/sdl/sdl_input.c         | 25 ++++++++++++----
 code/server/sv_bot.c         |  6 ++--
 code/sys/con_win32.c         | 70 +++++++++++++++++++++++++++++++++++++++-----
 10 files changed, 101 insertions(+), 23 deletions(-)

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