From f7c733fdbe636b3e888600054b54a6790b9e518d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samy=20Pess=C3=A9?= <samypesse@gmail.com>
Date: Fri, 21 Feb 2014 16:52:41 +0100
Subject: [PATCH] Bump version to 0.6.0

---
 CHANGES      | 12 ++++++++++++
 package.json |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 7ef781eb..19f99d8b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,15 @@
+2014-02-21  Samy Pessé  <samy.pesse@friendco.de>
+            Aaron O'Mullan <aaron.omullan@friendco.de>
+
+    * Bump version to 0.6.0
+    * New realtime collaboration (much more stable and efficient)
+    * Desktop applications build for Linux (32 bits) and Mac
+    * Deployment (FTP, GitHub Pages, Parse, Heroku, Google App Engine)
+    * Improve iPad support
+    * Show collaborators in collaborative editor (cursor and name)
+    * Auto-run App Engine applications with dev_server
+    * Auto-run Parse applications
+
 2014-02-11  Samy Pessé  <samy.pesse@friendco.de>
             Aaron O'Mullan <aaron.omullan@friendco.de>
 
diff --git a/package.json b/package.json
index 4193a65f..322ca0e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codebox",
-    "version": "0.5.7",
+    "version": "0.6.0",
     "description": "Open source cloud & desktop IDE.",
     "homepage": "https://www.codebox.io",
     "author": "FriendCode Inc. <contact@friendco.de>",