James Chen 26cf81e42e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 ... Conflicts: cocos2dx/CCScheduler.h cocos2dx/include/ccTypes.h		2012-06-08 14:14:13 +08:00
..
CCTexture2D.cpp	issue #1310: First commit since sync to rc2.	2012-06-08 14:11:48 +08:00
CCTexture2D.h	issue #1310: First commit since sync to rc2.	2012-06-08 14:11:48 +08:00
CCTextureAtlas.cpp	fixed #1270: Fixed some warning on win32.	2012-05-29 17:11:33 +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	issue #1310: syncronize actions	2012-06-08 13:55:28 +08:00
CCTextureCache.h	issue #1310: syncronize actions	2012-06-08 13:55:28 +08:00
CCTexturePVR.cpp	issue #1310: First commit since sync to rc2.	2012-06-08 14:11:48 +08:00
CCTexturePVR.h	issue #1310: First commit since sync to rc2.	2012-06-08 14:11:48 +08:00