[Pkg-owncloud-commits] [owncloud-client] 13/21: Merge tag 'v2.0.2-rc2' into 2.0

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 5f43c9cfad5f8d5731eac2c4ddbef53ed786f5cb
Merge: 24a801d 4c9bc42
Author: Markus Goetz <markus at woboq.com>
Date:   Tue Oct 20 15:45:47 2015 +0200

    Merge tag 'v2.0.2-rc2' into 2.0
    
    Second RC of ownCloud Client 2.0.2

 VERSION.cmake                  | 2 +-
 cmake/modules/NSIS.template.in | 5 +++++
 src/cmd/CMakeLists.txt         | 2 +-
 src/gui/CMakeLists.txt         | 4 ++--
 src/libsync/CMakeLists.txt     | 2 +-
 test/owncloud_add_test.cmake   | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --cc VERSION.cmake
index 23cbc66,2b81672..886c363
--- 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 )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git