[openjk] 09/11: Merge tag 'upstream/0_20170122+dfsg1' into debian/master

[Simon McVittie]

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

smcv pushed a commit to branch debian/master
in repository openjk.

commit 76ae9247a1da42735219a694f251e155f27dfd31
Merge: 3f73e59 765aec2
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Jan 22 10:06:54 2017 +0000

    Merge tag 'upstream/0_20170122+dfsg1' into debian/master
    
    Upstream version 0~20170122+dfsg1

 code/game/G_Timer.cpp                | 15 +++++++--------
 code/game/Q3_Interface.cpp           |  6 +++---
 code/game/g_roff.cpp                 |  4 +++-
 code/icarus/IcarusImplementation.cpp | 36 ++++++++++++++++++------------------
 code/qcommon/ojk_saved_game.cpp      |  3 ++-
 code/server/sv_savegame.cpp          |  1 +
 codeJK2/game/Q3_Registers.cpp        |  6 +++---
 codeJK2/game/g_roff.cpp              |  2 +-
 shared/qcommon/q_platform.h          |  2 +-
 9 files changed, 39 insertions(+), 36 deletions(-)

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