X-Git-Url: http://git.alex.org.uk

diff --git a/ChangeLog b/ChangeLog
index af5a4ed..cba8196 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2012-08-11 Michael Jumper <zhangmaike@users.sourceforge.net>
+
+	* Migrate to guacamole-common 0.6.1
+	* Migrate to guacamole-common-js 0.6.1
+
+2012-06-03 Michael Jumper <zhangmaike@users.sourceforge.net>
+
+	* Fix clipboard blur bug
+
+2012-05-04 Michael Jumper <zhangmaike@users.sourceforge.net>
+
+	* Touch-specific menus and keyboard support
+	* Logout prompt
+	* Multiple connections per user in user-mapping.xml
+	* Touch-related UI usability improvements
+	* Support for single sign-on
+	* Support for authentication involving parameters in URLs
+	* Test for WebSocket support (pluggable WebSocket support not yet stable)
+	* UI style improvements
+
 2011-12-11 Michael Jumper <zhangmaike@users.sourceforge.net>
 
 	* Improved UI usability