X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.gitattributes;h=14c10a42706a302437fa270fa570effabcf67fdd;hp=ec3bfe3d1054e3a7f5ebd372dee7c3b00e766d3a;hb=HEAD;hpb=0b2b94b02edc3a3af4a7eb7402fc0c46d506fd9b

diff --git a/.gitattributes b/.gitattributes
index ec3bfe3d10..454b3377c9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,41 +1,40 @@
 * -crlf
-
-*.0 -diff -crlf
+*.0 -crlf
 *.1 crlf=input
 *.3 crlf=input
-*.7z -diff -crlf
+*.7z -crlf
 *.ac crlf=input
-*.a -diff -crlf
+*.a -crlf
 *.afm crlf=input
 *.aft crlf=input
-*.ai -diff -crlf
+*.ai -crlf
 *.aliases crlf=input
 all crlf=input
 *.am crlf=input
 *.animinfo crlf=input
-*.aps -diff -crlf
-*.asc -diff -crlf
+*.aps -crlf
+*.asc -crlf
 *.ase -crlf
 *.bat -crlf
 *.bgs crlf=input
-*.blend1 -diff -crlf
-*.blend -diff -crlf
-blind_id -diff -crlf
-*.bmp -diff -crlf
+*.blend1 -crlf
+*.blend -crlf
+blind_id -crlf
+*.bmp -crlf
 branch-manager crlf=input
 *.brand crlf=input
 BSDmakefile crlf=input
 bsp2ent crlf=input
-*.bsp -diff -crlf
-*.cache -diff -crlf
+*.bsp -crlf
+*.cache crlf=input
+*.cbp -crlf
 *.cbp -crlf
-*.cbp -diff -crlf
 *.c crlf=input
 *.cfg crlf=input
 *.cg crlf=input
 ChangeLog crlf=input
 CHANGES crlf=input
-cjpeg -diff -crlf
+cjpeg -crlf
 COMPILING crlf=input
 compress-texture crlf=input
 *.conf crlf=input
@@ -44,39 +43,48 @@ COPYING crlf=input
 *.cpp crlf=input
 create crlf=input
 *.cron crlf=input
+crypto-keygen-standalone -crlf
 *.css crlf=input
 *.cvswrappers crlf=input
-*.d0pk -diff -crlf
-*.db -diff -crlf
+*.d0ir crlf=input
+*.d0pk -crlf
+*.db crlf=input
+*.db.* crlf=input
+*.def2ent crlf=input
 *.default crlf=input
 *.def crlf=input
-*.dem -diff -crlf
+*.dem -crlf
 *.dev -crlf
-dir -diff -crlf
-djpeg -diff -crlf
-*.dll -diff -crlf
-DOCS -diff -crlf
+dir -crlf
+*.directory crlf=input
+djpeg -crlf
+*.dll -crlf
+DOCS -crlf
 *.dot crlf=input
 DoxyConfig crlf=input
 doxyfile crlf=input
 Doxyfile crlf=input
 *.doxygen crlf=input
-*.dpm -diff -crlf
+*.dpm -crlf
 *.dsp -crlf
 *.dsw -crlf
 *.dtd crlf=input
-*.dylib -diff -crlf
-empty -diff -crlf
+*.dylib -crlf
+empty -crlf
 *.EncoderPlugin crlf=input
-*.flac -diff -crlf
+*.ent crlf=input
+etc_svc_git-daemon_run crlf=input
+*.flac -crlf
+*.flp -crlf
 *.form crlf=input
 *.framegroups crlf=input
+*.fteqccfail -crlf
 *.game crlf=input
 *.gdb crlf=input
 gendox crlf=input
 gendoxfunctions crlf=input
 genDoxyfile crlf=input
-*.gif -diff -crlf
+*.gif -crlf
 *.gitattributes crlf=input
 git-branch-manager crlf=input
 git-filter-index crlf=input
@@ -92,36 +100,39 @@ git-svn-update crlf=input
 git-update-octopus crlf=input
 *.glp crlf=input
 *.glsl crlf=input
+GPL-2 crlf=input
+GPL-3 crlf=input
 GPL crlf=input
 *.hardwired crlf=input
 *.h crlf=input
 *.hs crlf=input
+*.htaccess crlf=input
 *.html crlf=input
 *.html-part crlf=input
-*.icns -diff -crlf
-*.ico -diff -crlf
+*.icns -crlf
+*.ico -crlf
 *.idl crlf=input
 *.idsoftware crlf=input
-*.inc crlf=input
 *.in crlf=input
-*.info-1 -diff -crlf
-*.info-2 -diff -crlf
-*.info -diff -crlf
+*.inc crlf=input linguist-language=C gitlab-language=C
+*.info-1 -crlf
+*.info-2 -crlf
+*.info -crlf
 *.inl crlf=input
-*.instantaction crlf=input
-*.iqm -diff -crlf
+*.iOS crlf=input
+*.iqm -crlf
 *.java crlf=input
 *.jhm crlf=input
 *.jnlp crlf=input
-jpegtran -diff -crlf
-*.jpg -diff -crlf
+jpegtran -crlf
+*.jpg -crlf
 *.jsmooth crlf=input
 *.la crlf=input
 LGPL crlf=input
 LICENSE crlf=input
-*.lmp -diff -crlf
+*.lmp -crlf
 *.loaders crlf=input
-*.lso -diff -crlf
+*.lso -crlf
 *.m4 crlf=input
 makefile crlf=input
 Makefile crlf=input
@@ -129,94 +140,102 @@ makespr32 crlf=input
 *.map -crlf filter=mapclean
 *.mapinfo crlf=input
 *.m crlf=input
-*.md3 -diff -crlf
+*.md3 -crlf
 *.md5anim -crlf
 *.md5mesh -crlf
-*.mdl -diff -crlf
+*.mdl -crlf
 *.med crlf=input
 *.mf crlf=input
-*.mid -diff -crlf
+*.mid -crlf
 *.mk crlf=input
-*.mkdir -diff -crlf
-*.mmpz -diff -crlf
+*.mkdir -crlf
+*.mmpz -crlf
 *.modules crlf=input
+*.mp3 -crlf
 *.nib -crlf
 *.obj -crlf
-OFFSETS -diff -crlf
-*.ogg -diff -crlf
+OFFSETS -crlf
+*.ogg -crlf
 *.options crlf=input
+*.otf -crlf
 pangorc crlf=input
+*.part crlf=input
 *.patch crlf=input
 *.patchsets crlf=input
+*.pbxproj crlf=input
 *.pc crlf=input
-*.pcx -diff -crlf
-*.pfb -diff -crlf
-*.pfm -diff -crlf
-*.pk3 -diff -crlf
+*.pfb -crlf
+*.pfm -crlf
+*.php crlf=input
+*.pk3 -crlf
 PkgInfo crlf=input
 *.pl crlf=input
 *.plist crlf=input
 *.pm crlf=input
-*.png -diff -crlf
-POSITIONS -diff -crlf
+*.png -crlf
+*.po crlf=input
+POSITIONS -crlf
+*.pot crlf=input
 *.proj -crlf
 *.properties crlf=input
-*.psd -diff -crlf
+*.psd -crlf
 *.py crlf=input
 *.q3map1 crlf=input
-*.qc crlf=input
+*.q[ch] crlf=input linguist-language=C gitlab-language=C
 *.qdt crlf=input
-*.qh crlf=input
+*.rar -crlf
 *.rb crlf=input
 *.rc2 crlf=input
 *.rc -crlf
-rdjpgcom -diff -crlf
+rdjpgcom -crlf
 *.readme crlf=input
 README crlf=input
-*.rtlights -diff -crlf
+*.rtlights crlf=input
 SCHEMA crlf=input
 *.scm crlf=input
 sdl-config crlf=input
-SDL -diff -crlf
+SDL -crlf
+*.sfd -crlf
 *.shader crlf=input
 *.sh crlf=input
 *.skin crlf=input
 *.sln -crlf
 *.sounds crlf=input
-*.sp2 -diff -crlf
-*.spr32 -diff -crlf
-*.spr -diff -crlf
+*.sp2 -crlf
+*.spr32 -crlf
+*.spr -crlf
 *.src crlf=input
 *.strings crlf=input
 strip crlf=input
-*.svg -diff -crlf
-*.TAB -diff -crlf
-*.tga -diff -crlf
-TMAP -diff -crlf
+*.svg -crlf
+*.TAB -crlf
+*.tga -crlf
+TMAP -crlf
 todo crlf=input
 TODO crlf=input
-*.ttf -diff -crlf
-*.TTF -diff -crlf
+*.ttf -crlf
 *.txt crlf=input
+*.txt.* crlf=input
 update-shaderlists crlf=input
 *.vbs -crlf
 *.vcproj -crlf
+*.vcxproj crlf=input
 versionbuilder crlf=input
-*.wav -diff -crlf
-*.waypoints -diff -crlf
-w crlf=input
+*.vhost crlf=input
+*.wav -crlf
+*.waypoints crlf=input
 *.width crlf=input
 *.workspace -crlf
-wrjpgcom -diff -crlf
-*.xcf -diff -crlf
+wrjpgcom -crlf
+*.xcf -crlf
 *.xlink crlf=input
 *.xml crlf=input
 xonotic-map-compiler-autobuild crlf=input
 xonotic-map-compiler crlf=input
 xonotic-map-screenshot crlf=input
-xonotic-osx-agl crlf=input
 xonotic-osx-sdl crlf=input
 *.xpm crlf=input
-*.zip -diff -crlf
+*.xrns -crlf
+*.zip -crlf
 zipdiff crlf=input
-*.zym -diff -crlf
+*.zym -crlf