From 25d3f4215faba63d0788d53bdcf84b32cb1e0944 Mon Sep 17 00:00:00 2001
From: minggo <ming@cocos2d-x.org>
Date: Wed, 26 Sep 2012 16:04:22 +0800
Subject: [PATCH] update AUTHORS and CHANGELOG

---
 AUTHORS   | 13 +++++++++++++
 CHANGELOG |  1 +
 2 files changed, 14 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index ce17347873..cf7f8f935d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -106,6 +106,19 @@ Developers:
     Dongyang Cai(John-cdy)
         add automatically test tools
 
+    jzgenius
+        build new version of libcurl to support armv7s
+        fix some memory leak
+
+    ByungChoi
+         modify linux makefiles to fix compiling errors
+
+    edbartley
+         update MSVS and MAC projects to use project-relative path
+
+    Weeds 
+         use fontconfig to enhance font rendering on linux
+
 Retired Core Developers:
     WenSheng Yang
 	Author of windows port, CCTextField, 
diff --git a/CHANGELOG b/CHANGELOG
index 46de48a335..220ac50b48 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ cocos2d-2.0-x-2.0.3 @Sep.26 2012
     Bug       #1464: fix a crash caused by CCLabelBMFont
     Bug       #1478: fix a bug that TMX parser causes tileset images not to be loaded
     Bug       #1479: fix a bug that CCNotificationCenter does not check whether the object is valid before post notification
+    Bug       #1485: fix potential memory leak in CCNotificationObserver
     Feature   #1458: add CCTableView
     Feature   #1460: min/max allowed value for CCControlSlider
     Feature   #1470: update CCBReader to cocosbuilder v2.1 beta