walzer 5b3bb2a087 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 ... Conflicts fixed: cocos2dx/platform/ios/FontLabel/FontLabel.m cocos2dx/platform/ios/FontLabel/FontLabelStringDrawing.m template/xcode4/lib_js.xctemplate/TemplateInfo.plist		2012-09-24 11:03:26 +08:00
..
Classes	add proj.android to samples/SimpleGame, use getVisibleSize & getVisibleOrigin instead of getWinSize	2012-09-09 21:41:48 +08:00
Resources	upgrade Cocos2dSimpleGame to v2.0.2 framework, add it into samples folder	2012-09-09 20:20:29 +08:00
proj.android	fixed #1481: merge Nicolas's pull request and do some bug fixes	2012-09-21 17:01:19 +08:00
proj.ios	issue #1482, fix typos, mehod -> method.	2012-09-24 10:54:03 +08:00