[colobot] 32/145: Merge branch 'master' into dev
Didier Raboud
odyx at moszumanska.debian.org
Mon Jul 11 12:56:14 UTC 2016
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository colobot.
commit 02633e32c312443669b98aeaabe0db391dbd2634
Merge: 39b364f e77f9db
Author: krzys-h <krzys_h at interia.pl>
Date: Sat Apr 2 23:55:32 2016 +0200
Merge branch 'master' into dev
CMakeLists.txt | 2 +-
src/app/main.cpp | 15 +++++++++++----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --cc CMakeLists.txt
index 9de7ae9,e57e73a..c5edf93
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -13,12 -13,12 +13,12 @@@ project(colobot C CXX
set(COLOBOT_VERSION_CODENAME "Gold")
set(COLOBOT_VERSION_MAJOR 0)
set(COLOBOT_VERSION_MINOR 1)
- set(COLOBOT_VERSION_REVISION 7)
+ set(COLOBOT_VERSION_REVISION 7b)
# Used on official releases
-set(COLOBOT_VERSION_RELEASE_CODENAME "-alpha")
+#set(COLOBOT_VERSION_RELEASE_CODENAME "-alpha")
# Used on unreleased, development builds
-#set(COLOBOT_VERSION_UNRELEASED "+alpha")
+set(COLOBOT_VERSION_UNRELEASED "+alpha")
# Append git characteristics to version
if(DEFINED COLOBOT_VERSION_UNRELEASED)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git
More information about the Pkg-games-commits
mailing list