James Chen 47b8148064 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1191_gles20_template		2012-05-04 02:08:31 +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 #1190: used std::string as key of CCDictionary. Updated CCString.pkg, CCArray.pkg, CCDictionary.pkg.	2012-04-26 11:39:49 +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	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1191_gles20_template	2012-05-04 02:08:31 +08:00