[openjk] 106/130: Merge pull request #878 from bibendovsky/fix/saved_game_compiling_errors

[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 bb0b2f0a541117aba77fc7b59ee51defda99a5b6
Merge: b40ab00 0a268e7
Author: Alex Lo <alex at acslo.com>
Date:   Tue Oct 11 08:03:09 2016 +0100

    Merge pull request #878 from bibendovsky/fix/saved_game_compiling_errors
    
    PR 848 fix

 code/game/G_Timer.cpp                    |  4 ++--
 code/game/Q3_Interface.cpp               | 10 +++++-----
 code/game/g_roff.cpp                     |  4 ++--
 code/game/g_savegame.cpp                 |  4 ++--
 code/game/g_vehicles.h                   |  4 ++--
 code/icarus/IcarusImplementation.cpp     |  2 +-
 code/qcommon/ojk_saved_game.cpp          |  2 +-
 code/qcommon/ojk_saved_game_helper.h     |  2 --
 code/qcommon/ojk_saved_game_helper_fwd.h |  4 ++--
 code/rd-vanilla/G2_misc.cpp              |  5 +++++
 code/server/sv_savegame.cpp              |  8 ++++----
 codeJK2/game/G_Timer.cpp                 |  4 ++--
 codeJK2/game/Q3_Registers.cpp            | 10 +++++-----
 codeJK2/game/g_roff.cpp                  |  2 +-
 codeJK2/game/g_savegame.cpp              |  4 ++--
 codeJK2/icarus/Instance.cpp              | 10 +++++-----
 codeJK2/icarus/Sequence.cpp              | 14 ++++++++++----
 codeJK2/icarus/Sequencer.cpp             |  4 ++--
 codeJK2/icarus/TaskManager.cpp           | 14 +++++++-------
 shared/sys/sys_win32.cpp                 |  2 +-
 20 files changed, 61 insertions(+), 52 deletions(-)

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