Merge branch 'master' into divVerent/crypto2
-rw-r--r-- 3680 .gitattributes
-rw-r--r-- 81 .gitignore
drwxr-xr-x - Docs
-rwxr-xr-x 40983 all
-rwxr-xr-x 1266 check-gitattributes.sh
-rwxr-xr-x 770 copy-gitattributes-to-branches.sh
drwxr-xr-x - data
-rwxr-xr-x 18009 gpl.txt
-rw-r--r-- 280 key_0.d0pk
-rw-r--r-- 280 key_15.d0pk
drwxr-xr-x - misc
-rw-r--r-- 11244 readme.html
drwxr-xr-x - server
-rwxr-xr-x 2111 xonotic-linux-glx.sh
lrwxrwxrwx 20 xonotic-linux-sdl.sh -> xonotic-linux-glx.sh