James Chen a71e5be0d8 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20_optimize_data ... Conflicts: cocos2dx/shaders/CCGLProgram.cpp		2012-04-16 12:45:47 +08:00
..
Classes	fixed #1165: Close retinaDisplay for HelloWorld by default. Removed ENABLE_ALL_SHADER macro. Fixed some issues in CCSprite.cpp.	2012-04-16 12:00:35 +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	Fixed memory leaks in CCString and CCDictionary, Updated CCFileUtils_ios.mm.Remove inline prefix for some member function of CCString, so that make it compiled successfully on android and ios.	2012-04-16 10:57:37 +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