Merge branch 'release-1.2'
Conflicts: cmake/Version.cmake src/main.cpp
This commit is contained in:
commit
c2ff72deba
|
@ -3,11 +3,11 @@
|
||||||
# Version numbers.
|
# Version numbers.
|
||||||
set(CLEMENTINE_VERSION_MAJOR 1)
|
set(CLEMENTINE_VERSION_MAJOR 1)
|
||||||
set(CLEMENTINE_VERSION_MINOR 2)
|
set(CLEMENTINE_VERSION_MINOR 2)
|
||||||
set(CLEMENTINE_VERSION_PATCH 0)
|
set(CLEMENTINE_VERSION_PATCH 1)
|
||||||
#set(CLEMENTINE_VERSION_PRERELEASE p)
|
# set(CLEMENTINE_VERSION_PRERELEASE rc4)
|
||||||
|
|
||||||
# This should be set to OFF in a release branch
|
# 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:
|
# Rules about version number comparison on different platforms:
|
||||||
# Debian:
|
# Debian:
|
||||||
|
|
Loading…
Reference in New Issue