From: Markus Goetz <markus@woboq.com>
Date: Tue, 20 Oct 2015 13:45:47 +0000 (+0200)
Subject: Merge tag 'v2.0.2-rc2' into 2.0
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1395^2~19
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5f43c9cfad5f8d5731eac2c4ddbef53ed786f5cb;p=nextcloud-desktop.git

Merge tag 'v2.0.2-rc2' into 2.0

Second RC of ownCloud Client 2.0.2
---

5f43c9cfad5f8d5731eac2c4ddbef53ed786f5cb
diff --cc VERSION.cmake
index 23cbc66f0,2b816726d..886c36300
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@@ -4,7 -4,7 +4,7 @@@ set( MIRALL_VERSION_PATCH 2 
  set( MIRALL_SOVERSION 0 )
  
  if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-     set( MIRALL_VERSION_SUFFIX "rc1") #e.g. beta1, beta2, rc1
 -    set( MIRALL_VERSION_SUFFIX "rc2") #e.g. beta1, beta2, rc1
++    set( MIRALL_VERSION_SUFFIX "rc3") #e.g. beta1, beta2, rc1
  endif( NOT DEFINED MIRALL_VERSION_SUFFIX )
  
  if( NOT DEFINED MIRALL_VERSION_BUILD )