[colobot] 254/377: Merge pull request #714 from Erihel/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 a5ff72e6351804389235cdd9d0b14c41a0f7ed87
Merge: 1fc9186 8a0cda1
Author: krzys_h <krzys_h at interia.pl>
Date:   Wed Feb 10 20:12:13 2016 +0100

    Merge pull request #714 from Erihel/dev
    
    3 issues

 src/app/input.cpp                  |  2 ++
 src/common/event.cpp               |  1 +
 src/common/event.h                 |  1 +
 src/common/key.h                   |  1 +
 src/common/restext.cpp             |  2 ++
 src/level/robotmain.cpp            | 39 ++++++++++++++++++++++++++------------
 src/level/robotmain.h              |  1 +
 src/ui/controls/edit.cpp           | 12 ++++++++++--
 src/ui/controls/edit.h             |  1 +
 src/ui/screen/screen_main_menu.cpp | 10 ++++++++++
 10 files changed, 56 insertions(+), 14 deletions(-)

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