[colobot] 67/145: Merge branch 'dev-savegame' into 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 d3f808f66deb1b8103080fffea5a08d87a20ae99
Merge: 4de9d25 ae4e875
Author: krzys-h <krzys_h at interia.pl>
Date:   Sun Apr 10 13:16:10 2016 +0200

    Merge branch 'dev-savegame' into dev

 src/level/robotmain.cpp        | 55 ++----------------------------------------
 src/object/task/taskshield.cpp | 13 +++++++++-
 2 files changed, 14 insertions(+), 54 deletions(-)


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