From ca35c4c7508bf02cc8bee6304f256c1da61336b0 Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Thu, 8 Sep 2016 16:25:05 +0200
Subject: [PATCH] version++

---
 CHANGES.rst           | 18 ++++++++++++++++++
 MatrixSDK.podspec     |  4 ++--
 MatrixSDK/MXSession.m |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index c9fd644eef..0c629e6e25 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,21 @@
+Changes in Matrix iOS SDK in 0.6.14 (2016-09-08)
+================================================
+
+Improvements:
+ * Allow MXSession to run the events stream in background for special cases
+ * MXEvent: Add the m.room.encrypted type
+ * MXSession: Expose the list of user ids for whom a 1:1 room exists (https://github.com/vector-im/vector-ios/issues/529).
+ * MXStore: Save MXUsers in the store (https://github.com/vector-im/vector-ios/issues/406).
+ * MXTools: Expose regex used to identify email address, user ids, room ids & and room aliases. Cache their regex objects to improve performance.
+ * MXTools: Add [MXTools isMatrixEventIdentifier:].
+ * MXTools: Add methods to create permalinks to room or event (https://github.com/vector-im/vector-ios/issues/547).
+ 
+Bug fixes:
+ * MXKRoomState.aliases: some addresses are missing  (https://github.com/vector-im/vector-ios/issues/528).
+ * MXFileStore: Stop leaking background tasks, which kill the app after 180s of bg.
+ * MXCall: Add a timeout for outgoing calls (https://github.com/vector-im/vector-ios/issues/577).
+ * MXJingleCallStackCall: When screen is locked, rotating the screen landscape makes local video preview go upside down (https://github.com/vector-im/vector-ios/issues/519).
+
 Changes in Matrix iOS SDK in 0.6.13 (2016-08-25)
 ================================================
 
diff --git a/MatrixSDK.podspec b/MatrixSDK.podspec
index 01ed0e18d1..a1cbccfad3 100644
--- a/MatrixSDK.podspec
+++ b/MatrixSDK.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MatrixSDK"
-  s.version      = "0.6.13"
+  s.version      = "0.6.14"
   s.summary      = "The iOS SDK to build apps compatible with Matrix (http://www.matrix.org)"
 
   s.description  = <<-DESC
@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
 
   s.platform     = :ios, "7.0"
 
-  s.source       = { :git => "https://github.com/matrix-org/matrix-ios-sdk.git", :tag => "v0.6.13" }
+  s.source       = { :git => "https://github.com/matrix-org/matrix-ios-sdk.git", :tag => "v0.6.14" }
   s.source_files = "MatrixSDK", "MatrixSDK/**/*.{h,m}"
   s.resources    = "MatrixSDK/Data/Store/MXCoreDataStore/*.xcdatamodeld"
 
diff --git a/MatrixSDK/MXSession.m b/MatrixSDK/MXSession.m
index 92640e1724..1c10c3a5ac 100644
--- a/MatrixSDK/MXSession.m
+++ b/MatrixSDK/MXSession.m
@@ -30,7 +30,7 @@
 
 #pragma mark - Constants definitions
 
-const NSString *MatrixSDKVersion = @"0.6.13";
+const NSString *MatrixSDKVersion = @"0.6.14";
 NSString *const kMXSessionStateDidChangeNotification = @"kMXSessionStateDidChangeNotification";
 NSString *const kMXSessionNewRoomNotification = @"kMXSessionNewRoomNotification";
 NSString *const kMXSessionWillLeaveRoomNotification = @"kMXSessionWillLeaveRoomNotification";