[colobot] 83/145: Merge pull request #781 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 fc7e6214714c0c959fe00f200dcd30653107bbc0
Merge: cdd719c 6491ce0
Author: krzys_h <krzys_h at interia.pl>
Date:   Fri May 27 11:37:03 2016 +0200

    Merge pull request #781 from melex750/dev
    
    Fix "this" bug - #256 & #436

 src/CBot/CBotInstr/CBotInstrMethode.cpp | 13 ++++++++-----
 src/CBot/CBotStack.cpp                  | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)

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