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
..
Classes	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-04-15 15:46:01 +08:00
Resources	issue #1056: synchronise cocos2d-iphone-2.0-rc0a	2012-03-16 13:42:53 +08:00
android	fixed #1142: fix TouchesTest crashed on Android and iOS	2012-04-13 09:45:31 +08:00
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
ios	issue #1056: Update the configuration of ios project.Sort the the project folder.	2012-03-21 11:07:31 +08:00
linux	update linux project configure	2012-02-15 15:57:09 +08:00
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
qnx	fixed #994: add support for bbndk2.0 on blackberry platform.	2012-03-01 16:52:17 +08:00
win32	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-04-15 15:46:01 +08:00
wophone	update wophone setup project (such as helloworld,tests)	2011-06-30 09:36:51 +08:00