From a9cc40cc6a1cc83c0565500768db17c3862f4580 Mon Sep 17 00:00:00 2001
From: "Huabing.Xu" <dabingnn@gmail.com>
Date: Wed, 31 Dec 2014 10:34:42 +0800
Subject: [PATCH] [ci skip] update changeLog

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

diff --git a/CHANGELOG b/CHANGELOG
index e3a22197a7..674fcde4f4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@ cocos2d-x-3.4beta0  ??
     [FIX]           ui::Button: fix setTitleColor calls method setColor instead of setTextColor of title label.
     [FIX]           FileUtils: WebP format with alpha channel displayed wrong
     [FIX]           Label: content size of Label is incorrect if the string is set to empty string
+    [FIX]           GLProgramState: fix assert error caused by outdated uniform and attribute cache
 
 cocos2d-x-3.3 Dec.12
     [FIX]           Billboard: allow billboard rotate along z axis