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	rename Resource(in HelloLua and HelloWorld project) and Res(in tests project) to Resources.	2012-02-14 18:04:56 +08:00
android	fixed #721: cocosdenshion can play local file on android	2012-03-06 16:56:30 +08:00
ios	fixed #972: update ios project configures.	2012-02-16 11:48:09 +08:00
marmalade	Added Marmalade support to TextInputTest and HelloLua samples	2012-01-15 15:57:10 +01:00
win32	fixed memory leak from CCGLProgram.cpp	2012-04-11 11:15:53 +08:00