From 609b937b39e48468e1f97ddec68a5efdd249da44 Mon Sep 17 00:00:00 2001
From: James Chen <jianhua.chen@cocos2d-x.org>
Date: Tue, 18 Feb 2014 15:59:56 +0800
Subject: [PATCH] Update CHANGELOG [ci skip]

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

diff --git a/CHANGELOG b/CHANGELOG
index 84da1d96a4..0f1510a450 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ cocos2d-x-3.0rc0 Feb.?? 2014
      [NEW]          Using python to automatically generate script bindings codes.
      [NEW]          Linux javascript bindings support.
      
+     [FIX]          Merge cocostudio/CCActionXxx to CCAction.
      [FIX]          Supports 'setTimeout' and 'setInterval' in JSB.
      [FIX]          Exposes the missing data structures of Spine to JS.
      [FIX]          Node::setRotation() moves opposite when node has a physics body.