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
..
android	Updated android template.	2012-08-30 18:27:35 +08:00
blackberry	Updated templates for android,blackberry,win32 and ios.	2012-08-29 21:03:47 +08:00
msvc	Adding the VC++2012 template to install-templates-msvc.bat	2012-09-01 14:32:46 -06:00
xcode4	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-09-24 11:03:26 +08:00