Phenix Yu e623cd6357 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 ... Conflicts: cocos2dx/include/CCTexture2D.h cocos2dx/include/ccMacros.h cocos2dx/textures/CCTexture2D.cpp lua/cocos2dx_support/LuaCocos2d.cpp		2012-04-15 15:46:01 +08:00
..
CCAnimation.cpp	issue #1056: Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.	2012-03-20 15:04:53 +08:00
CCAnimationCache.cpp	#issue #1056: Updated SpriteTest.	2012-03-23 17:31:28 +08:00
CCSprite.cpp	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-04-15 15:46:01 +08:00
CCSpriteBatchNode.cpp	issue #1056: Removed CCNode::arrayMakeObjectsPerformSelector, instead, we defined two macros (arrayMakeObjectsPerformSelector and arrayMakeObjectsPerformSelectorWithObject) to fit for any classes that inherit from CCNode.	2012-03-29 14:30:13 +08:00
CCSpriteFrame.cpp	issue #1056: synchronise cocos2d-iphone-2.0-rc0a	2012-03-16 13:42:53 +08:00
CCSpriteFrameCache.cpp	issue #1056: Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.	2012-03-20 15:04:53 +08:00