[iortcw] 02/04: Merge tag 'upstream/1.42b+20150301+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 66a0329d9c5f92d4c9bc67733d0ac373e551d89e
Merge: 4266fc3 becd469
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Mar 12 22:01:09 2015 +0000

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

 MP/Makefile                           |   92 ++-
 MP/README_RASPBERRYPI                 |   33 +
 MP/README_VC                          |   14 -
 MP/code/botlib/be_aas_entity.c        |    4 +-
 MP/code/botlib/be_aas_move.c          |    2 +-
 MP/code/botlib/be_aas_reach.c         |    8 +-
 MP/code/botlib/be_ai_move.c           |    2 +-
 MP/code/botlib/l_precomp.c            |    6 +-
 MP/code/cgame/cg_flamethrower.c       |    2 +-
 MP/code/cgame/cg_servercmds.c         |    2 +-
 MP/code/cgame/cg_weapons.c            |    2 +-
 MP/code/client/cl_cin.c               |    2 +-
 MP/code/client/cl_input.c             |    4 +-
 MP/code/client/snd_openal.c           |    2 +-
 MP/code/es/es_gamma.c                 |   34 -
 MP/code/es/es_glimp.c                 |  547 -------------
 MP/code/es/es_input.c                 |  346 --------
 MP/code/es/es_snd.c                   |   76 --
 MP/code/es/etc1encode.c               | 1129 --------------------------
 MP/code/game/ai_cast_funcs.c          |    6 +-
 MP/code/game/ai_cast_script_actions.c |    6 +-
 MP/code/game/ai_main.c                |    7 +-
 MP/code/qcommon/common.c              |    4 +
 MP/code/qcommon/q_shared.h            |    5 -
 MP/code/rend2/tr_bloom.c              |  446 -----------
 MP/code/rend2/tr_fbo.c                |    3 -
 MP/code/rend2/tr_init.c               |    8 +-
 MP/code/rend2/tr_main.c               |    4 +-
 MP/code/renderer/qgl.h                | 1402 ++++++++++++++++----------------
 MP/code/renderer/tr_animation.c       |    6 +-
 MP/code/renderer/tr_backend.c         |  152 ++--
 MP/code/renderer/tr_bloom.c           |   26 +
 MP/code/renderer/tr_cmds.c            |   12 +-
 MP/code/renderer/tr_image.c           |  279 +++++--
 MP/code/renderer/tr_init.c            |   67 +-
 MP/code/renderer/tr_local.h           |    9 +-
 MP/code/renderer/tr_main.c            |   24 +-
 MP/code/renderer/tr_shade.c           |   81 +-
 MP/code/renderer/tr_shadows.c         |   91 ++-
 MP/code/renderer/tr_sky.c             |  123 +--
 MP/code/renderer/tr_surface.c         |   83 +-
 MP/code/sdl/sdl_glimp.c               |   61 +-
 MP/code/sdl/sdl_input.c               |   18 +-
 MP/code/server/sv_bot.c               |    6 +-
 MP/code/splines/q_splineshared.h      |    5 -
 MP/code/sys/sys_loadlib.h             |   16 -
 MP/code/sys/sys_main.c                |   18 -
 MP/code/ui/ui_shared.c                |    8 +-
 MP/make-raspberrypi.sh                |   11 +-
 SP/Makefile                           |   92 ++-
 SP/README_RASPBERRYPI                 |   33 +
 SP/README_VC                          |   14 -
 SP/code/botlib/be_aas_entity.c        |    4 +-
 SP/code/botlib/be_aas_move.c          |    2 +-
 SP/code/botlib/be_aas_reach.c         |    8 +-
 SP/code/botlib/be_ai_move.c           |    2 +-
 SP/code/botlib/l_precomp.c            |    6 +-
 SP/code/cgame/cg_consolecmds.c        |    4 +-
 SP/code/cgame/cg_flamethrower.c       |    2 +-
 SP/code/cgame/cg_servercmds.c         |   28 +-
 SP/code/cgame/cg_weapons.c            |    2 +-
 SP/code/client/cl_cin.c               |    2 +-
 SP/code/client/cl_input.c             |    4 +-
 SP/code/client/snd_openal.c           |    2 +-
 SP/code/es/es_gamma.c                 |   34 -
 SP/code/es/es_glimp.c                 |  547 -------------
 SP/code/es/es_input.c                 |  346 --------
 SP/code/es/es_snd.c                   |   76 --
 SP/code/es/etc1encode.c               | 1129 --------------------------
 SP/code/game/ai_cast_funcs.c          |    6 +-
 SP/code/game/ai_cast_script_actions.c |    9 +-
 SP/code/game/ai_main.c                |    7 +-
 SP/code/game/g_func_decs.h            |    2 +
 SP/code/game/g_funcs.h                |    2 +
 SP/code/game/g_main.c                 |    5 +-
 SP/code/game/g_script.c               |    2 +
 SP/code/game/g_script_actions.c       |   13 +-
 SP/code/qcommon/common.c              |    4 +
 SP/code/qcommon/q_shared.h            |    5 -
 SP/code/rend2/tr_fbo.c                |    3 -
 SP/code/rend2/tr_init.c               |    9 +-
 SP/code/rend2/tr_local.h              |    5 +-
 SP/code/rend2/tr_main.c               |    4 +-
 SP/code/renderer/qgl.h                | 1403 +++++++++++++++++----------------
 SP/code/renderer/tr_animation.c       |    6 +-
 SP/code/renderer/tr_backend.c         |  153 ++--
 SP/code/renderer/tr_bloom.c           |   26 +
 SP/code/renderer/tr_cmds.c            |   14 +-
 SP/code/renderer/tr_image.c           |  275 +++++--
 SP/code/renderer/tr_init.c            |   69 +-
 SP/code/renderer/tr_local.h           |   14 +-
 SP/code/renderer/tr_main.c            |   25 +-
 SP/code/renderer/tr_shade.c           |   97 +--
 SP/code/renderer/tr_shadows.c         |   90 ++-
 SP/code/renderer/tr_sky.c             |  123 +--
 SP/code/renderer/tr_surface.c         |   84 +-
 SP/code/renderer/tr_types.h           |    1 -
 SP/code/sdl/sdl_glimp.c               |   61 +-
 SP/code/sdl/sdl_input.c               |   18 +-
 SP/code/server/sv_bot.c               |    6 +-
 SP/code/splines/q_splineshared.h      |    5 -
 SP/code/sys/sys_loadlib.h             |   16 -
 SP/code/sys/sys_main.c                |   18 -
 SP/code/ui/ui_shared.c                |    8 +-
 SP/make-raspberrypi.sh                |    7 +-
 105 files changed, 3101 insertions(+), 7125 deletions(-)

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