Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj
History
natural-law 1991a65b0b Merge branch 'master' into iss391 
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
 		2011-03-29 10:20:57 +08:00
..
TemplateIcon.icns [ios] rename template/ios_mac folder to template/xcode3 folder. Get ready for xcode4 templates 2011-03-15 15:57:36 +08:00
project.pbxproj.REMOVED.git-id Merge branch 'master' into iss391 2011-03-29 10:20:57 +08:00