From e1f7b4297b091a3cec19760bb4643d978d9d0703 Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Wed, 24 Oct 2012 11:57:55 -0700
Subject: [PATCH] Update ChangeLog

---
 guacamole/ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/guacamole/ChangeLog b/guacamole/ChangeLog
index 5bfb86a78..a188c123f 100644
--- a/guacamole/ChangeLog
+++ b/guacamole/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-24 Michael Jumper <zhangmaike@users.sourceforge.net>
+
+	* Implement auto-scaling
+	* Send optimal width/height
+	* Detect and send supported audio mimetypes
+
 2012-10-15 Michael Jumper <zhangmaike@users.sourceforge.net>
 
 	* Migrate to guacamole-common 0.6.2