[colobot] 43/62: Merge pull request #994 from DavivaD/dev-issue-658

[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 6b1dd5dd8b2f3d581125ec1a188772213ad6b5e7
Merge: ee0f3ff ee35d35
Author: krzys_h <krzys_h at interia.pl>
Date:   Sun Oct 22 18:22:06 2017 +0200

    Merge pull request #994 from DavivaD/dev-issue-658
    
    Thumper & Recycler Enhancements.

 src/object/task/taskrecover.cpp   |   2 +-
 src/object/task/taskterraform.cpp | 111 ++++++++++++++++++++++++++++++++++++--
 2 files changed, 109 insertions(+), 4 deletions(-)

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