Bump version to 2.0.0 final, some Changlog addings

diff --git a/ChangeLog b/ChangeLog
index 4f8f188308fdf9d3f1a6dc1dd231ad20c0824c76..0aa76d6cf76f3883ab6b3637690ec3e887687c25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 ChangeLog
 =========
-version 2.0.0 (release 2015-08-??)
+version 2.0.0 (release 2015-08-25)
   * Add support for multiple accounts (#3084)
   * Do not sync down new big folders from server without users consent (#3148)
   * Integrate Selective Sync into the default UI
@@ -25,6 +25,7 @@ version 2.0.0 (release 2015-08-??)
   * Several fixes and performance improvements in the sync engine
   * Network: Try to use SSL session tickets/identifiers. Check the SSL button to see if they are used.
   * Bandwidth Throttling: Provide automatic limit setting for downloads (#3084)
+  * Systray: Workaround for issue with Qt 5.5.0 #3656
 
 version 1.8.4 (release 2015-07-13)
   * Release to ship a security release of openSSL. No source changes of the ownCloud Client code.

diff --git a/VERSION.cmake b/VERSION.cmake
index 49cac6bb3ad2808f048bb00a4621a0850b417aec..6adf9484cd838b5bc4d060f195a85fe69e39fa55 100644 (file)
--- 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 "rc2") #e.g. beta1, beta2, rc1
+    set( MIRALL_VERSION_SUFFIX "") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )
 
 if( NOT DEFINED MIRALL_VERSION_BUILD )