Merge branch 'release-1.1'

This commit is contained in:
David Sansome 2012-10-25 08:36:33 +02:00
commit 574fb11585
1 changed files with 3 additions and 3 deletions

View File

@ -2,12 +2,12 @@
# Version numbers.
set(CLEMENTINE_VERSION_MAJOR 1)
set(CLEMENTINE_VERSION_MINOR 0)
set(CLEMENTINE_VERSION_PATCH 1)
set(CLEMENTINE_VERSION_MINOR 1)
set(CLEMENTINE_VERSION_PATCH 0)
#set(CLEMENTINE_VERSION_PRERELEASE rc1)
# This should be set to OFF in a release branch
set(INCLUDE_GIT_REVISION ON)
#set(INCLUDE_GIT_REVISION ON)
# Rules about version number comparison on different platforms:
# Debian: