James Chen 3a410c14a1 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create ... Conflicts: cocos2dx/extensions/CCBReader/CCBReader_v2.cpp cocos2dx/extensions/CCControlExtension/CCScale9Sprite.cpp cocos2dx/label_nodes/CCLabelBMFont.cpp cocos2dx/menu_nodes/CCMenuItem.cpp cocos2dx/menu_nodes/CCMenuItem.h cocos2dx/misc_nodes/CCRenderTexture.h cocos2dx/tileMap_parallax_nodes/CCTileMapAtlas.cpp tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder.cpp tests/tests/LabelTest/LabelTest.cpp		2012-06-14 17:36:31 +08:00
..
CCTexture2D.cpp	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create	2012-06-14 17:36:31 +08:00
CCTexture2D.h	issue #1322: vertical alignment ok on iOS	2012-06-13 16:20:58 +08:00
CCTextureAtlas.cpp	issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder.	2012-06-14 16:05:58 +08:00
CCTextureAtlas.h	issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug).	2012-04-25 16:18:04 +08:00
CCTextureCache.cpp	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create	2012-06-14 17:36:31 +08:00
CCTextureCache.h	fixed #1322: vertical alignment works ok on android	2012-06-13 18:33:44 +08:00
CCTexturePVR.cpp	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create	2012-06-14 17:36:31 +08:00
CCTexturePVR.h	issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder.	2012-06-14 16:05:58 +08:00