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
..
Resources	Updated strings.xml	2012-04-10 16:21:23 +08:00
test.android	Updated some files.	2012-04-04 21:58:04 +08:00
test.bada	fixed #984: Use static library for cocos2dx project on platforms(bada and qnx) that use gcc compiler. Because dynamic_cast may fail if you use a gcc compiler.	2012-02-28 14:59:46 +08:00
test.ios	create folder for shader	2012-04-10 15:30:11 +08:00
test.linux	update linux project configure	2012-02-15 15:57:09 +08:00
test.marmalade	fixed #995: Modify project configure for marmalade port after adding extension support and refactor resource folder.	2012-03-01 17:38:31 +08:00
test.qnx	fixed #994: add support for bbndk2.0 on blackberry platform.	2012-03-01 16:52:17 +08:00
test.win32	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-04-15 15:46:01 +08:00
test.wophone	fixed #702 tests crashs at the start on wophone device	2011-08-30 15:59:06 +08:00
tests	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1156_director	2012-04-13 14:11:58 +08:00
Android.mk	issue #1056: Update Android.mk. Make tests project being compiled successfully.	2012-03-21 22:49:58 +08:00
AppDelegate.cpp	fixed #1156 syn CCDirector	2012-04-13 14:11:35 +08:00
AppDelegate.h	issue #375: rename file names and object names	2011-03-07 17:11:57 +08:00