James Chen 395dbc90aa Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance ... Conflicts: lua/cocos2dx_support/LuaCocos2d.cpp		2012-05-02 18:23:16 +08:00
..
Classes	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance	2012-05-02 18:23:16 +08:00
Resources	issue #1056: synchronise cocos2d-iphone-2.0-rc0a	2012-03-16 13:42:53 +08:00
proj.android	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance	2012-05-02 18:23:16 +08:00
proj.ios	issue #1194: Updated ios project configurations after adding CCTextureWatcher.	2012-05-02 10:39:39 +08:00
proj.win32	issue #1204: Removed CCApplication::initInstance.	2012-05-02 17:50:26 +08:00