[colobot] 28/145: Merge pull request #751 from OdyX/018-minor-fixes

[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 d84304cba5dd9b87c014e9a663ea92f8fd61ae7a
Merge: ef0147e 761c854
Author: krzys_h <krzys_h at interia.pl>
Date:   Wed Mar 30 14:00:45 2016 +0200

    Merge pull request #751 from OdyX/018-minor-fixes
    
    Fix spelling error, and add Keywords to the desktop file

 desktop/colobot.ini                |  2 +-
 desktop/create_desktop_file.sh     |  2 +-
 desktop/po/colobot-desktop.pot     |  8 +++++++-
 desktop/po/fr.po                   | 10 ++++++++--
 src/CBot/CBotProgram.h             |  4 ++--
 src/CBot/CBotStack.h               |  2 +-
 src/app/signal_handlers.cpp        |  4 ++--
 src/graphics/opengl/gl21device.cpp |  2 +-
 src/graphics/opengl/gl33device.cpp |  2 +-
 src/graphics/opengl/gldevice.cpp   |  2 +-
 src/graphics/opengl/glutil.cpp     |  8 ++++----
 src/level/robotmain.cpp            | 10 +++++-----
 12 files changed, 34 insertions(+), 22 deletions(-)

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