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	[Lua] update HelloLua	2012-09-11 17:31:21 +08:00
Resources	[Lua] fix: HelloLua	2012-09-10 12:23:45 +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.blackberry	Resource file searching implementation for blackberry.	2012-08-27 13:48:17 +08:00
proj.ios	issue #1482, fix typos, mehod -> method.	2012-09-24 10:54:03 +08:00
proj.win32	issue #1437:make CCApplication::sharedApplication() return pointer	2012-08-21 15:28:43 +08:00