[iortcw] 02/06: Merge tag 'upstream/1.42b+20150316+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 c7118a958e5f30aa952e1ab085a57bcf3a67303a
Merge: 7c67e9e 9150d70
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Mar 17 23:53:33 2015 +0000

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

 .gitignore                      |   38 +
 MP/.gitignore                   |   38 +
 MP/Makefile                     |   54 +-
 MP/code/qcommon/ioapi.c         |  182 -----
 MP/code/qcommon/ioapi.h         |   75 --
 MP/code/qcommon/unzip.c         | 1602 ---------------------------------------
 MP/code/qcommon/unzip.h         |  355 ---------
 MP/code/rend2/tr_animation.c    |   18 +-
 MP/code/rend2/tr_backend.c      |   16 +-
 MP/code/rend2/tr_shade.c        |   30 +-
 MP/code/renderer/tr_animation.c |   18 +-
 README.md                       |  733 ++++++++++++++++++
 SP/.gitignore                   |   38 +
 SP/Makefile                     |   54 +-
 SP/code/qcommon/ioapi.c         |  182 -----
 SP/code/qcommon/ioapi.h         |   75 --
 SP/code/qcommon/unzip.c         | 1602 ---------------------------------------
 SP/code/qcommon/unzip.h         |  355 ---------
 SP/code/rend2/tr_animation.c    |   18 +-
 SP/code/rend2/tr_backend.c      |   16 +-
 SP/code/rend2/tr_shade.c        |   30 +-
 SP/code/renderer/tr_animation.c |   18 +-
 22 files changed, 943 insertions(+), 4604 deletions(-)

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