[colobot] 130/145: Merge pull request #793 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 3e30ccfdfa3bd1a2dd6d2c4d2e75c07be9d96b63
Merge: 3b9b9b3 d0d0c4f
Author: krzys-h <krzys_h at interia.pl>
Date:   Mon Jul 4 12:20:39 2016 +0200

    Merge pull request #793 from melex750/dev
    
    Fix some bugs in CBOT
    
    This fixes https://github.com/colobot/colobot/issues/728#issuecomment-205039570 and #626

 src/CBot/CBotInstr/CBotDefArray.cpp     |  9 +++++++++
 src/CBot/CBotInstr/CBotInstrMethode.cpp |  1 +
 src/CBot/CBotInstr/CBotListArray.cpp    | 19 +++++++++----------
 src/CBot/CBotInstr/CBotListArray.h      |  2 +-
 src/CBot/CBotInstr/CBotNew.cpp          |  6 +++++-
 src/CBot/CBotProgram.cpp                |  2 ++
 6 files changed, 27 insertions(+), 12 deletions(-)

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