axmol/template/xcode4
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
..
base_ios.xctemplate issue #1482, fix typos, mehod -> method. 2012-09-24 10:54:03 +08:00
cocos2dx.xctemplate fixed #1482, deal with ios6 orientation in templates/xcode4, with a little refactoring. 2012-09-23 22:11:29 +08:00
cocos2dx_box2d.xctemplate fixed #1482, deal with ios6 orientation in templates/xcode4, with a little refactoring. 2012-09-23 22:11:29 +08:00
cocos2dx_chipmunk.xctemplate fixed #1482, deal with ios6 orientation in templates/xcode4, with a little refactoring. 2012-09-23 22:11:29 +08:00
cocos2dx_js.xctemplate Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-24 11:03:26 +08:00
cocos2dx_lua.xctemplate fixed #1482, deal with ios6 orientation in templates/xcode4, with a little refactoring. 2012-09-23 22:11:29 +08:00
lib_cocos2dx.xctemplate fixed #1482, deal with ios6 orientation in templates/xcode4, with a little refactoring. 2012-09-23 22:11:29 +08:00