carlo morgantini b2579987e5 Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge ... Conflicts: cocos2d_libs.xcodeproj/project.pbxproj cocos2dx/include/ccTypes.h samples/samples.xcodeproj/project.pbxproj		2013-07-31 13:58:25 -07:00
..
CCTexture2D.cpp	Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge	2013-07-31 13:58:25 -07:00
CCTexture2D.h	Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge	2013-07-31 13:58:25 -07:00
CCTextureAtlas.cpp	fix bugs with new Label stuff and add new sample for unicode	2013-07-30 16:41:26 -07:00
CCTextureAtlas.h	issue #2378: Setter/Getter for TextureAtlas, removing CC_PROPERTY_XXX macros.	2013-07-23 14:18:35 +08:00
CCTextureCache.cpp	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345	2013-07-27 22:06:30 +08:00
CCTextureCache.h	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345	2013-07-27 22:06:30 +08:00
CCTexturePVR.cpp	ccGLXXX -> GL::xxx	2013-07-25 18:42:53 -07:00
CCTexturePVR.h	Refactor Image and Texture2D, combine TexturePVR to Image and Texture2D, and delete TexturePVR	2013-07-25 21:35:00 +08:00