This website requires JavaScript.
Explore
Minetest
Help
Sign In
Ginger88895
/
warzone2100
Watch
1
Star
0
Fork
You've already forked warzone2100
0
Code
Issues
Pull Requests
Packages
Projects
Releases
Wiki
Activity
686645e1a6
warzone2100
/
.gitattributes
4 lines
90 B
Plaintext
Raw
Normal View
History
Unescape
Escape
Hopefully make it so conflicts in the xcode project files are automatically resolved. This is done by making them not actually merge (it still will need to be done though just by hand on a platform where it can be tested).
2012-02-03 15:06:06 -08:00
*.pbxproj -crlf merge=ours
*.xcworkspacedata -crlf merge=ours
*.xcscheme -crlf merge=ours