[colobot] 41/62: Merge pull request #1004 from melex750/dev-cbot

[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 9448f6712f5aee5009abbf7cbf7a1213b693b474
Merge: 0a83508 e3c44e9
Author: krzys_h <krzys_h at interia.pl>
Date:   Sun Oct 22 18:20:50 2017 +0200

    Merge pull request #1004 from melex750/dev-cbot
    
    Escape codes for strings in CBOT

 po/colobot.pot                           |  18 ++++
 po/de.po                                 |  18 ++++
 po/fr.po                                 |  18 ++++
 po/pl.po                                 |  18 ++++
 po/ru.po                                 |  18 ++++
 src/CBot/CBotEnums.h                     |   6 ++
 src/CBot/CBotInstr/CBotExprLitString.cpp | 144 ++++++++++++++++++++++++++++---
 src/CBot/CBotInstr/CBotExprLitString.h   |   3 +
 src/CBot/CBotToken.cpp                   |  25 ++----
 src/CBot/CBotUtils.cpp                   |  45 ++++++++++
 src/CBot/CBotUtils.h                     |  15 ++++
 src/common/restext.cpp                   |   6 ++
 src/script/script.cpp                    |  58 ++++++++++++-
 test/unit/CBot/CBot_test.cpp             | 114 ++++++++++++++++++++++++
 14 files changed, 474 insertions(+), 32 deletions(-)

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