[colobot] 03/04: Merge tag 'upstream/0.1.7b' into debian/master

[Didier Raboud]

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

odyx pushed a commit to annotated tag debian/0.1.7b-1
in repository colobot.

commit f3fcfb246109578e77afd412e2bd1902bb182759
Merge: d47a5a4 e77f9db
Author: Didier Raboud <odyx at debian.org>
Date:   Mon Apr 4 17:06:00 2016 +0200

    Merge tag 'upstream/0.1.7b' into debian/master

 CMakeLists.txt   |  2 +-
 src/app/main.cpp | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

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