From 063bc6b833f70ac5b886251aee0c41bdd7829492 Mon Sep 17 00:00:00 2001
From: minggo <ming@cocos2d-x.org>
Date: Thu, 14 Nov 2013 11:54:54 +0800
Subject: [PATCH] [ci skip]

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

diff --git a/CHANGELOG b/CHANGELOG
index d848fd916c..9a5fcc000f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -26,6 +26,7 @@ cocos2d-x-3.0alpha1 @??? 2013
      [NEW]          External: added | operator for Control::EventType
      [NEW]          Android & iOS screen size change support
      [NEW]          GLProgram: setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv
+     [NEW]          Color[3|4][B|F]: comparable and explicit convertible
 [Android]
      [FIX]          Added EGL_RENDERABLE_TYPE to OpenGL attributes
      [FIX]          Fixed application will crash when pause and resume.