[colobot] 113/145: Merge pull request #783 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 bf2e3cdfaeb7114cc5ec60cb601b8f5305cbf4e6
Merge: 7ce23fd 37ab015
Author: krzys-h <krzys_h at interia.pl>
Date:   Fri Jun 17 22:41:53 2016 +0200

    Merge pull request #783 from melex750/dev
    
    [INFO] Conversion to string

 src/CBot/CBotInstr/CBotExpression.cpp  | 23 +++++++++++++++++++++--
 src/CBot/CBotInstr/CBotInstrUtils.cpp  |  6 +++---
 src/CBot/CBotInstr/CBotInstrUtils.h    |  8 +++++++-
 src/CBot/CBotInstr/CBotLeftExprVar.cpp |  6 ++++++
 src/CBot/CBotInstr/CBotTwoOpExpr.cpp   | 16 +++++++++++++---
 5 files changed, 50 insertions(+), 9 deletions(-)

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