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
..
Android.mk	issue #973: refactor lua support	2012-02-10 12:02:46 +08:00
AppDelegate.cpp	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-04-15 15:46:01 +08:00
AppDelegate.h	update HelloLua	2012-02-09 17:48:15 +08:00