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 |
||
---|---|---|
.. | ||
Classes | ||
Resources | ||
Prefix.pch | ||
TemplateIcon.icns |