warzone2100

Author	SHA1	Message	Date
dak180	d9010d186f	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 23:40:24 -05:00
dak180	0859ae95a0	Make xcworkspacedata and xcscheme treated as binaries for merges.	2011-04-02 16:04:03 -04:00
dak180	117e50ef20	Some times being able to see the diffs for xcode files can be useful; continue treat them as binary for merges though	2010-12-13 20:11:37 -05:00
dak180	6473b8eded	Treat the xcode project as a binary.	2010-10-08 18:51:16 -04:00