Permalink
Fetching contributors…
Cannot retrieve contributors at this time
6 lines (5 sloc) 86 Bytes
# Xcode
*.pbxproj -crlf -merge
# Visual Studio
*.vcproj -crlf -diff
*.sln -crlf -diff