[colobot] 29/74: Merge pull request #809 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 d83553ca1481b0420958d029b684148e8d270950
Merge: 0ecdee0 8b3c430
Author: krzys_h <krzys_h at interia.pl>
Date:   Tue Aug 9 19:23:49 2016 +0200

    Merge pull request #809 from melex750/dev
    
    Fixes and unit tests for inheritance

 src/CBot/CBotClass.cpp                  |  15 +-
 src/CBot/CBotDefParam.cpp               |   5 +
 src/CBot/CBotInstr/CBotDefClass.cpp     |  19 ++-
 src/CBot/CBotInstr/CBotFunction.cpp     |  14 +-
 src/CBot/CBotInstr/CBotFunction.h       |   3 +-
 src/CBot/CBotInstr/CBotInstrMethode.cpp |  25 ++-
 src/CBot/CBotInstr/CBotInstrMethode.h   |   3 +
 src/CBot/CBotInstr/CBotLeftExpr.cpp     |   7 +-
 src/CBot/CBotInstr/CBotListArray.cpp    |   7 +-
 src/CBot/CBotStack.cpp                  |  36 ++++-
 src/CBot/CBotVar/CBotVarPointer.cpp     |   4 +-
 test/unit/CBot/CBot_test.cpp            | 277 ++++++++++++++++++++++++++++++++
 12 files changed, 388 insertions(+), 27 deletions(-)

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