Ricardo Quesada 88928fff99 Merge branch 'developNewLabelMerge' into merge_new_label ... Conflicts: cocos2d_libs.xcodeproj/project.pbxproj cocos2dx/textures/CCTexture2D.h samples/Javascript/Shared		2013-07-19 16:04:23 -07:00
..
etc	1. Add C++ code to decode ETC file	2013-07-01 17:40:57 +08:00
CCTexture2D.cpp	issue #2407: more best practices fixes, more getter and const..	2013-07-19 14:57:54 +08:00
CCTexture2D.h	Merge branch 'developNewLabelMerge' into merge_new_label	2013-07-19 16:04:23 -07:00
CCTextureAtlas.cpp	issue #2410: Reverting some changes about VAO. And adding CC_ENABLE_CACHE_TEXTURE_DATA to 'EVNET_COME_TO_FOREGROUND' in DrawNode.	2013-07-17 13:53:16 +08:00
CCTextureAtlas.h	more best practices fixes	2013-07-17 16:56:19 -07:00
CCTextureCache.cpp	more best practices fixes	2013-07-17 16:56:19 -07:00
CCTextureCache.h	more best practices fixes	2013-07-17 16:56:19 -07:00
CCTextureETC.cpp	getInstance() / destroyInstance() are used...	2013-07-11 15:24:23 -07:00
CCTextureETC.h	issue #2328 refractor etc support:	2013-07-02 15:36:47 +08:00
CCTexturePVR.cpp	getInstance() / destroyInstance() are used...	2013-07-11 15:24:23 -07:00
CCTexturePVR.h	more best practices fixes	2013-07-17 16:56:19 -07:00