[openjk] 07/11: Merge pull request #905 from smcv/load-icarus

[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 7b5f79adb24f5d9f3c9f93f0760bb7afc8acbf61
Merge: faeacb5 9c38824
Author: Ensiform <ensiform at gmail.com>
Date:   Sat Jan 21 16:43:43 2017 -0600

    Merge pull request #905 from smcv/load-icarus
    
    Fix loading Icarus scripts from savegames, improve error reporting

 code/game/G_Timer.cpp                | 14 ++++++--------
 code/game/Q3_Interface.cpp           |  6 +++---
 code/game/g_roff.cpp                 |  4 +++-
 code/icarus/IcarusImplementation.cpp | 35 +++++++++++++++++------------------
 codeJK2/game/Q3_Registers.cpp        |  6 +++---
 codeJK2/game/g_roff.cpp              |  2 +-
 6 files changed, 33 insertions(+), 34 deletions(-)


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