[openjk] 03/05: Merge tag 'upstream/0_20150524+dfsg1'

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository openjk.

commit 3b45c997365ceb70f799a45b58ae1e7e83cc3c1f
Merge: 1ce022f 3684ee3
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jun 6 18:38:07 2015 +0100

    Merge tag 'upstream/0_20150524+dfsg1'
    
    Upstream version 0~20150524+dfsg1

 CMakeLists.txt                | 54 +++++++++++++++++++++++++++----------------
 code/CMakeLists.txt           |  4 ++--
 code/client/cl_keys.cpp       |  4 ++--
 code/game/NPC_stats.cpp       |  4 ++--
 code/game/g_savegame.cpp      |  2 +-
 code/mp3code/l3.h             | 32 +++----------------------
 code/qcommon/common.cpp       | 10 ++++----
 code/qcommon/cvar.cpp         | 18 +++++++--------
 code/qcommon/stv_version.h    |  6 ++---
 codeJK2/cgame/cg_weapons.cpp  |  4 ++--
 codeJK2/game/g_savegame.cpp   |  2 +-
 codeJK2/icarus/blockstream.h  |  1 +
 codeJK2/icarus/tokenizer.h    |  1 +
 codemp/CMakeLists.txt         |  4 ++--
 codemp/client/cl_cgameapi.cpp |  2 +-
 codemp/client/cl_keys.cpp     |  4 ++--
 codemp/client/cl_uiapi.cpp    |  2 +-
 codemp/game/NPC_spawn.c       |  6 ++---
 codemp/game/g_client.c        |  4 ++--
 codemp/game/w_force.c         |  2 +-
 codemp/mp3code/l3.h           | 32 +++----------------------
 codemp/qcommon/common.cpp     | 10 ++++----
 codemp/qcommon/cvar.cpp       | 18 +++++++--------
 codemp/qcommon/game_version.h |  8 +++----
 codemp/qcommon/vm.cpp         |  4 ++--
 codemp/server/sv_ccmds.cpp    |  8 +++----
 codemp/server/sv_gameapi.cpp  |  2 +-
 27 files changed, 106 insertions(+), 142 deletions(-)

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