[iortcw] 04/10: Merge tag 'upstream/1.42b+20141229+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 7ce2da0f619c4011f298c687a178bff7835a816e
Merge: d912111 7a2b799
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jan 3 22:43:54 2015 +0000

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

 MP/code/game/g_main.c    | 2 ++
 MP/code/server/sv_main.c | 2 +-
 SP/code/game/g_main.c    | 1 +
 SP/code/server/sv_main.c | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

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