[iortcw] 04/17: Merge tag 'upstream/1.42b+20150713+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 f3c28a072ebc955b45a71175d2fea683def14fcf
Merge: 3bf37f3 258e98b
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Jul 14 10:41:42 2015 +0100

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

 MP/HOWTO-Build.txt                 |   8 +-
 MP/Makefile                        | 306 +++++++++-----
 MP/README_RASPBERRYPI              |   8 +-
 MP/code/asm/snapvector.asm         |   4 -
 MP/code/cgame/cg_draw.c            |   2 +
 MP/code/cgame/cg_event.c           |  23 +-
 MP/code/cgame/cg_local.h           |   1 +
 MP/code/cgame/cg_main.c            |   2 +
 MP/code/cgame/cg_servercmds.c      |   4 +-
 MP/code/cgame/cg_view.c            |  29 +-
 MP/code/cgame/cg_weapons.c         |   2 +-
 MP/code/client/cl_avi.c            |  12 -
 MP/code/client/cl_cin.c            |   4 +-
 MP/code/client/cl_main.c           |  26 +-
 MP/code/game/ai_dmq3.c             |   1 +
 MP/code/qcommon/cm_patch.c         |  10 +-
 MP/code/qcommon/common.c           |   2 +-
 MP/code/qcommon/files.c            |   6 +-
 MP/code/qcommon/q_platform.h       |   8 +-
 MP/code/qcommon/q_shared.c         |   2 +-
 MP/code/qcommon/unzip.c            |  12 +-
 MP/code/qcommon/vm_x86.c           |  27 +-
 MP/code/rend2/glsl/generic_vp.glsl |  55 +++
 MP/code/rend2/qgl.h                | 815 +++++++++++++++++++------------------
 MP/code/rend2/tr_animation.c       |   6 +-
 MP/code/rend2/tr_extramath.c       |   2 +-
 MP/code/rend2/tr_fbo.c             |   3 -
 MP/code/rend2/tr_font.c            |  45 +-
 MP/code/rend2/tr_glsl.c            |   9 +-
 MP/code/rend2/tr_image.c           |   6 +-
 MP/code/rend2/tr_light.c           |  11 +-
 MP/code/rend2/tr_local.h           |   4 +
 MP/code/rend2/tr_main.c            |   4 +
 MP/code/rend2/tr_shade.c           | 136 +++++++
 MP/code/rend2/tr_shader.c          |  18 +
 MP/code/rend2/tr_world.c           |   7 +
 MP/code/renderer/tr_animation.c    |   6 +-
 MP/code/renderer/tr_font.c         |  45 +-
 MP/code/renderer/tr_image.c        |   4 +-
 MP/code/renderer/tr_light.c        |   8 +-
 MP/code/renderer/tr_main.c         |   4 +
 MP/code/renderer/tr_shader.c       |  17 +
 MP/code/sdl/sdl_glimp.c            |  18 +-
 MP/code/sdl/sdl_input.c            |   2 +-
 MP/code/sys/sys_unix.c             |   2 +-
 MP/code/sys/sys_win32.c            |  11 +
 MP/make-macosx-ub.sh               |  21 +-
 MP/make-macosx_xcode3.sh           |   7 +-
 MP/make-macosx_xcode4.sh           |   8 +-
 MP/make-macosx_xcode5.sh           |   8 +-
 SP/HOWTO-Build.txt                 |   8 +-
 SP/Makefile                        | 306 +++++++++-----
 SP/README_RASPBERRYPI              |   8 +-
 SP/code/asm/snapvector.asm         |   4 -
 SP/code/cgame/cg_draw.c            |   7 +
 SP/code/cgame/cg_event.c           |  23 +-
 SP/code/cgame/cg_local.h           |   1 +
 SP/code/cgame/cg_main.c            |   2 +
 SP/code/cgame/cg_servercmds.c      |   4 +-
 SP/code/cgame/cg_view.c            |  29 +-
 SP/code/cgame/cg_weapons.c         |   2 +-
 SP/code/client/cl_avi.c            |  12 -
 SP/code/client/cl_cin.c            |   4 +-
 SP/code/client/cl_main.c           |  26 +-
 SP/code/game/ai_dmq3.c             |   1 +
 SP/code/game/g_func_decs.h         |   2 +
 SP/code/game/g_funcs.h             |   2 +
 SP/code/qcommon/cm_patch.c         |  10 +-
 SP/code/qcommon/common.c           |   2 +-
 SP/code/qcommon/files.c            |   4 +-
 SP/code/qcommon/q_platform.h       |   8 +-
 SP/code/qcommon/q_shared.c         |   2 +-
 SP/code/qcommon/unzip.c            |  12 +-
 SP/code/qcommon/vm_x86.c           |  27 +-
 SP/code/rend2/glsl/generic_vp.glsl |  55 +++
 SP/code/rend2/qgl.h                | 814 ++++++++++++++++++------------------
 SP/code/rend2/tr_animation.c       |   6 +-
 SP/code/rend2/tr_extramath.c       |   2 +-
 SP/code/rend2/tr_fbo.c             |   3 -
 SP/code/rend2/tr_font.c            |  28 +-
 SP/code/rend2/tr_glsl.c            |   9 +-
 SP/code/rend2/tr_image.c           |   6 +-
 SP/code/rend2/tr_light.c           |  11 +-
 SP/code/rend2/tr_local.h           |   4 +
 SP/code/rend2/tr_main.c            |   4 +
 SP/code/rend2/tr_shade.c           | 136 +++++++
 SP/code/rend2/tr_shader.c          |  18 +
 SP/code/rend2/tr_world.c           |   7 +
 SP/code/renderer/tr_animation.c    |   6 +-
 SP/code/renderer/tr_font.c         |  28 +-
 SP/code/renderer/tr_image.c        |   4 +-
 SP/code/renderer/tr_light.c        |   8 +-
 SP/code/renderer/tr_main.c         |   4 +
 SP/code/renderer/tr_shader.c       |  17 +
 SP/code/sdl/sdl_glimp.c            |  18 +-
 SP/code/sdl/sdl_icon.h             |   2 +-
 SP/code/sdl/sdl_input.c            |   2 +-
 SP/code/sys/sys_unix.c             |   2 +-
 SP/code/sys/sys_win32.c            |  11 +
 SP/make-macosx-ub.sh               |  21 +-
 SP/make-macosx_xcode3.sh           |   7 +-
 SP/make-macosx_xcode4.sh           |   8 +-
 SP/make-macosx_xcode5.sh           |   8 +-
 103 files changed, 2170 insertions(+), 1366 deletions(-)

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