[colobot] 48/62: Merge pull request #1040 from melex750/dev

[Didier Raboud]

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

odyx pushed a commit to branch debian/master
in repository colobot.

commit 17d47e9b633171683955761ab1fb444d4c65b866
Merge: 387b7b5 d357de1
Author: krzys_h <krzys_h at interia.pl>
Date:   Sat Nov 4 11:24:09 2017 +0100

    Merge pull request #1040 from melex750/dev
    
    Saved game bug fix

 src/CBot/CBotInstr/CBotExprVar.cpp  |  4 ++++
 src/CBot/CBotInstr/CBotFunction.cpp | 10 ++++++----
 src/CBot/CBotInstr/CBotLeftExpr.cpp |  2 ++
 src/level/player_profile.cpp        |  2 ++
 src/level/robotmain.cpp             |  6 +++++-
 src/object/old_object.cpp           |  4 ++++
 6 files changed, 23 insertions(+), 5 deletions(-)


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