[iortcw] 11/17: Merge tag 'upstream/1.42b+20150811+dfsg1'

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository iortcw.

commit 22bb95ed7a98e5fc71e59290943dc6981e7b8314
Merge: 111116c 42ce875
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Aug 16 16:11:16 2015 +0100

    Merge tag 'upstream/1.42b+20150811+dfsg1'
    
    Upstream version 1.42b+20150811+dfsg1

 MP/Makefile                   |  29 +++------
 MP/code/botlib/be_aas_route.c | 148 +++++++++++++++++++++++++++++-------------
 MP/code/client/cl_curl.c      |  63 +++++++++++++-----
 MP/code/client/snd_openal.c   |   7 +-
 MP/code/game/bg_pmove.c       |  10 +--
 MP/code/qcommon/q_platform.h  |  35 ++--------
 MP/code/rend2/tr_world.c      |  62 +++++-------------
 MP/code/sdl/sdl_gamma.c       |   5 +-
 MP/code/sdl/sdl_glimp.c       |  30 ++++++---
 MP/code/sdl/sdl_input.c       |  10 +--
 MP/code/sdl/sdl_snd.c         |   2 +-
 MP/code/server/sv_ccmds.c     |   2 -
 MP/code/ui/ui_main.c          |  12 ++--
 SP/Makefile                   |  29 +++------
 SP/code/botlib/be_aas_route.c | 123 +++++++++++++++++++++++------------
 SP/code/client/cl_curl.c      |  63 +++++++++++++-----
 SP/code/client/snd_openal.c   |   7 +-
 SP/code/game/bg_pmove.c       |  10 +--
 SP/code/qcommon/q_platform.h  |  35 ++--------
 SP/code/sdl/sdl_gamma.c       |   5 +-
 SP/code/sdl/sdl_glimp.c       |  30 ++++++---
 SP/code/sdl/sdl_input.c       |  10 +--
 SP/code/sdl/sdl_snd.c         |   2 +-
 SP/code/server/sv_ccmds.c     |   8 ++-
 SP/code/server/sv_init.c      |  27 ++++++++
 SP/code/ui/ui_main.c          |  12 ++--
 26 files changed, 447 insertions(+), 329 deletions(-)

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