X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=.gitattributes;h=fb9e9b14c20bf4ae9a2761ec1a61a5f628ce27a0;hp=edd30fd6d3a6a26ff33e82b9aefc4add51322d70;hb=3891992d5465a6fae7d991541b6d08bb68dd19df;hpb=991fbce1912d07f6cc636d423fbc6ddc5560dd1c diff --git a/.gitattributes b/.gitattributes index edd30fd6..fb9e9b14 100644 --- a/.gitattributes +++ b/.gitattributes @@ -42,7 +42,7 @@ DoxyConfig crlf=input Doxyfile crlf=input *.doxygen crlf=input *.dpm -crlf -diff -*.dsp crlf=input +*.dsp -crlf *.dsw -crlf *.dtd crlf=input *.dylib -crlf -diff @@ -55,6 +55,7 @@ gendox crlf=input gendoxfunctions crlf=input genDoxyfile crlf=input *.gif -crlf -diff +*.gitattributes crlf=input git-branch-manager crlf=input git-filter-index crlf=input git-filter-repository crlf=input @@ -95,8 +96,8 @@ makespr32 crlf=input *.mapinfo crlf=input *.m crlf=input *.md3 -crlf -diff -*.md5anim crlf=input -*.md5mesh crlf=input +*.md5anim -crlf +*.md5mesh -crlf *.mdl -crlf -diff *.med crlf=input *.mf crlf=input @@ -120,11 +121,11 @@ pangorc crlf=input *.pk3 -crlf -diff PkgInfo crlf=input *.pl crlf=input -*.plist -crlf +*.plist crlf=input *.pm crlf=input *.png -crlf -diff POSITIONS -crlf -diff -*.proj crlf=input +*.proj -crlf *.properties crlf=input *.psd -crlf -diff *.py crlf=input @@ -134,7 +135,7 @@ POSITIONS -crlf -diff *.qh crlf=input *.rb crlf=input *.rc2 crlf=input -*.rc crlf=input +*.rc -crlf *.readme crlf=input README crlf=input *.rtlights -crlf -diff