From 90136b26347d731160792ffc0a1a27ec348048b8 Mon Sep 17 00:00:00 2001
From: minggo <ming@cocos2d-x.org>
Date: Tue, 3 Jun 2014 14:36:15 +0800
Subject: [PATCH] [ci skip]

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 4c3e9331d4..49504ddc83 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ cocos2d-x-3.2  ???
     [FIX]           Cocos2dxGLSurfaceView.java: prevent flickering when opening another activity
     [FIX]           Image: Set jpeg save quality to 90 
     [FIX]           Label: label is unsharp if it's created by smaller font
+    [FIX]           Others: Treat warning as error on iOS and Mac
     [FIX]           Repeat: will run one more over in rare situations
     [FIX]           SpriteFrameCache: fix memory leak