pandamicro 25cb0d2896 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 ... # Conflicts: # web		2015-08-03 19:47:56 +08:00
..
CCActionTimeline.cpp	Optimization of Custom Data.	2015-07-23 16:30:23 +08:00
CCActionTimeline.h	GBKToUTF8	2015-06-17 13:16:06 +08:00
CCActionTimelineCache.cpp	Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968	2015-07-27 11:55:18 +08:00
CCActionTimelineCache.h	Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968	2015-07-27 11:55:18 +08:00
CCActionTimelineNode.cpp	change file name	2014-12-04 18:51:32 +08:00
CCActionTimelineNode.h	GBKToUTF8	2015-06-17 13:16:06 +08:00
CCBoneNode.cpp	fix bug: crash when use bone after erase it form Vector. move the operation after erase, make sure bone ref* is not realeaed	2015-08-03 16:47:54 +08:00
CCBoneNode.h	some doxygen comments and copyright	2015-07-24 01:30:34 +08:00
CCFrame.cpp	Merge pull request #11785 from geron-cn/fixbug	2015-05-27 16:28:13 +08:00
CCFrame.h	Fix : remove using namespace cocos2d from header file	2015-07-31 00:02:57 +09:00
CCSkeletonNode.cpp	remove EMSCRIPTEN draw	2015-08-03 16:53:08 +08:00
CCSkeletonNode.h	fix bug:use wrong _modelviewTransform in director to draw bone	2015-07-24 19:48:05 +08:00
CCSkinNode.cpp	some doxygen comments and copyright	2015-07-24 01:30:34 +08:00
CCSkinNode.h	some doxygen comments and copyright	2015-07-24 01:30:34 +08:00
CCTimeLine.cpp	Fixes some warnings and a related bug in CCSprite.	2015-07-07 23:01:24 +08:00
CCTimeLine.h	Fixes some warnings and a related bug in CCSprite.	2015-07-07 23:01:24 +08:00
CCTimelineMacro.h	GBKToUTF8	2015-06-17 13:16:06 +08:00
CSLoader.cpp	Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3	2015-08-02 22:28:27 +08:00
CSLoader.h	Normalization function names	2015-07-28 14:05:56 +08:00