mirror of https://github.com/axmolengine/axmol.git
1991a65b0b
Conflicts: HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj cocos2dx/proj.win32/cocos2d-win32.vcproj cocos2dx/proj.wophone/Makefile.ARM cocos2dx/proj.wophone/cocos2d-wophone.vcproj template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj tests/test.ios/test.xcodeproj/project.pbxproj |
||
---|---|---|
.. | ||
Classes | ||
___PROJECTNAME___.xcodeproj | ||
ios | ||
LICENSE.chipmunk | ||
LICENSE.cocos2d-x | ||
___PROJECTNAMEASIDENTIFIER____Prefix.pch |