[colobot] 228/390: Merge branch 'dev' of git://github.com/piotrwalkusz1/colobot into dev

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch upstream/latest
in repository colobot.

commit ea9d075ed729d173ebcde9a7fadf89900929cc7e
Merge: 7a1c902 ec8b2cf
Author: krzys-h <krzys_h at interia.pl>
Date:   Fri Nov 14 20:34:01 2014 +0100

    Merge branch 'dev' of git://github.com/piotrwalkusz1/colobot into dev

 desktop/po/colobot-desktop.pot | 6 ++++--
 desktop/po/fr.po               | 6 ++++--
 src/ui/maindialog.cpp          | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

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