From 9ce09713b62106145148a44c0d5e766e0fcd0661 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <danimo@owncloud.com>
Date: Tue, 3 Sep 2013 16:45:45 +0200
Subject: [PATCH] 1.4.0 final

---
 ChangeLog     | 5 ++++-
 VERSION.cmake | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d86b2e470..fe0bef221 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 ChangeLog
 =========
-version 1.4.0beta1 (release 2013-08-08 ), csync 0.81.0 required
+version 1.4.0 (release 2013-09-04 ), csync 0.90.0 required
 
   * New Scheduler: Only sync when there are actual changes in the server
   * Add a Settings Dialog, move Proxy Settings there
@@ -19,6 +19,9 @@ version 1.4.0beta1 (release 2013-08-08 ), csync 0.81.0 required
   * Add an editor for ingore patterns
   * ALlow to flag certain ignore patterns as discardable
   * Ensure to ship with all valid translations
+  * Progress Dialog now preserves the last syncned items across sync runs
+  * Split Setup Wizard into multiple pages again
+  * Implement "--logfile -" to log to stdout
   * Add preliminary support for Shibboleth authentication
   * Linux: Provide more icon sizes
   * Linux: Do not trigger notifier on ignored files
diff --git a/VERSION.cmake b/VERSION.cmake
index ed99cd4a2..713a3f1d3 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,6 +1,6 @@
 set( VERSION_MAJOR 1 )
 set( VERSION_MINOR 4 )
 set( VERSION_PATCH 0 )
-set( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}rc1")
+set( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}")
 set( SOVERSION 0 )