[iortcw] 03/08: Merge tag 'upstream/1.42b+20151119+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 bfa4c315302ffda0cb49cf9c1bf975147e11c9f6
Merge: 47963d6 7950bc0
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Nov 21 22:42:43 2015 +0000

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

 MP/Makefile                   |   80 +--
 MP/code/client/cl_main.c      |    2 +-
 MP/code/qcommon/common.c      |    5 +
 MP/code/qcommon/files.c       |   10 +-
 MP/code/qcommon/q_shared.h    |    2 +-
 MP/code/qcommon/vm_armv7l.c   | 1210 +++++++++++++++++++++++++++++++++++++++++
 MP/code/rend2/tr_backend.c    |    1 -
 MP/code/rend2/tr_cmds.c       |   22 +-
 MP/code/rend2/tr_main.c       |   18 +-
 MP/code/rend2/tr_shade.c      |   57 +-
 MP/code/renderer/tr_backend.c |    1 -
 MP/code/renderer/tr_cmds.c    |   22 +-
 MP/code/renderer/tr_main.c    |   18 +-
 MP/code/sdl/sdl_glimp.c       |   21 +-
 MP/make-raspberrypi.sh        |    1 -
 SP/Makefile                   |   82 +--
 SP/code/client/cl_main.c      |    2 +-
 SP/code/game/g_save.c         |    5 +-
 SP/code/qcommon/common.c      |    5 +
 SP/code/qcommon/files.c       |   36 +-
 SP/code/qcommon/q_shared.h    |    2 +-
 SP/code/qcommon/qcommon.h     |    2 +-
 SP/code/qcommon/vm_armv7l.c   | 1210 +++++++++++++++++++++++++++++++++++++++++
 SP/code/rend2/tr_backend.c    |    2 -
 SP/code/rend2/tr_cmds.c       |   22 +-
 SP/code/rend2/tr_main.c       |   18 +-
 SP/code/rend2/tr_shade.c      |   57 +-
 SP/code/renderer/tr_backend.c |    2 -
 SP/code/renderer/tr_cmds.c    |   22 +-
 SP/code/renderer/tr_main.c    |   18 +-
 SP/code/sdl/sdl_glimp.c       |   21 +-
 SP/make-raspberrypi.sh        |    1 -
 32 files changed, 2784 insertions(+), 193 deletions(-)

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