diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2015-10-19 11:57:37 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2015-10-19 11:57:37 +0300 |
| commit | df135a0bb258b673977003421f5ea2f23b7c14e7 (patch) | |
| tree | aa4973eeea8784700cf8b1a0f8732ef2f3760394 /VERSION.cmake | |
| parent | b5e75afc171f79a3fa97dee438dde997e27a5558 (diff) | |
| parent | b7c927f34915fde9433aba6419c044e8885200cc (diff) | |
Merge branch '2.0'
Conflicts:
src/gui/folder.cpp
Diffstat (limited to 'VERSION.cmake')
| -rw-r--r-- | VERSION.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION.cmake b/VERSION.cmake index 30ae6e470..6ec2a2836 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -4,7 +4,7 @@ set( MIRALL_VERSION_PATCH 0 ) set( MIRALL_SOVERSION 0 ) if ( NOT DEFINED MIRALL_VERSION_SUFFIX ) - set( MIRALL_VERSION_SUFFIX "git") #e.g. beta1, beta2, rc1 + set( MIRALL_VERSION_SUFFIX "rc1") #e.g. beta1, beta2, rc1 endif( NOT DEFINED MIRALL_VERSION_SUFFIX ) if( NOT DEFINED MIRALL_VERSION_BUILD ) |