From 39ec684ac8748365bcb95e6a7f9db310d75e9cf3 Mon Sep 17 00:00:00 2001
From: minggo <ming@cocos2d-x.org>
Date: Wed, 13 Nov 2013 15:32:22 +0800
Subject: [PATCH] [ci skip]

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

diff --git a/CHANGELOG b/CHANGELOG
index e06e8d0e37..c0f33125bf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,13 +14,14 @@ cocos2d-x-3.0alpha1 @??? 2013
      [FIX]          When parsing XML using TinyXML, the data size has to be specified.
      [FIX]          Parameter type: const char* -> const string&
      [FIX]          Armature: many bug fixed, add more samples, add function to skip some frames when playing animation
+     [FIX]          Configuration of VAO in runtime
+     [FIX]          Webp Test Crashes.
      [NEW]          Arm64 support.
      [NEW]          Added Mouse Support For Desktop Platforms.
      [NEW]          Point: Adds ANCHOR_XXX constants like ANCHOR_MIDDLE, ANCHOR_TOP_RIGHT, etc.
      [NEW]          Sprite: Override setScale(float scaleX, float scaleY)
      [NEW]          External: added | operator for Control::EventType
      [NEW]          Android & iOS screen size change support
-     [FIX]          Webp Test Crashes.
 [Android]
      [FIX]          Added EGL_RENDERABLE_TYPE to OpenGL attributes
      [FIX]          Fixed application will crash when pause and resume.