mirror of https://github.com/axmolengine/axmol.git
5b3bb2a087
Conflicts fixed: cocos2dx/platform/ios/FontLabel/FontLabel.m cocos2dx/platform/ios/FontLabel/FontLabelStringDrawing.m template/xcode4/lib_js.xctemplate/TemplateInfo.plist |
||
---|---|---|
.. | ||
base_ios.xctemplate | ||
cocos2dx.xctemplate | ||
cocos2dx_box2d.xctemplate | ||
cocos2dx_chipmunk.xctemplate | ||
cocos2dx_js.xctemplate | ||
cocos2dx_lua.xctemplate | ||
lib_cocos2dx.xctemplate |