From d87bbdd7bb58cf255b197c88557a273579a5a694 Mon Sep 17 00:00:00 2001
From: James Chen <jianhua.chen@cocos2d-x.org>
Date: Wed, 22 Jan 2014 11:41:57 +0800
Subject: [PATCH] Update CHANGELOG [ci skip]

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 6c63702bca..c7e6efe235 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,11 +10,13 @@ cocos2d-x-3.0beta2 ?.? ?
      [NEW]          Renderer: Added BatchCommand. This command is not "batchable" with other commands, but improves performance in about 10%
      [NEW]          LuaBindings: Bindings-generator supports to bind namespace for lua.
      
+     [FIX]          Removes unused files for MAC platform after using glfw3 to create opengl context.
      [FIX]          Wrong arithmetic of child's position in ParallaxNode::addChild()
      [FIX]          CocoStudio: TestColliderDetector in ArmatureTest can't work.
      [FIX]          Crash if file doesn't exist when using FileUtils::getStringFromFile.
      [FIX]          If setting a shorter string than before while using LabelAtlas, the effect will be wrong.
      [FIX]          Label: Crash when using unknown characters.
+     [FIX]          Label: Missing line breaks and wrong alignment.
      [FIX]          Console: log(format, va_args) is private to prevent possible resolution errors
      [FIX]          Configuration: dumpInfo() -> getInfo()
      [FIX]          ControlSlider doesn't support to set selected thumb sprite.