Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'release-1.2' 

Conflicts:
	cmake/Version.cmake
	src/main.cpp
This commit is contained in:
David Sansome 2013-11-26 10:10:04 +11:00
parent 4a1d3e2de6 44a154ef56
commit c2ff72deba
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/Version.cmake
View File

@ -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: