[colobot] 65/390: Merge branch 'dev-physfs' into dev-physfs-levels

[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 d3eaf2e1ce9e1275bc0c68be890a939fca666909
Merge: de37554 71f84d1
Author: krzys-h <krzys_h at interia.pl>
Date:   Fri Sep 26 21:05:55 2014 +0200

    Merge branch 'dev-physfs' into dev-physfs-levels

 data              | 2 +-
 src/ui/window.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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