Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into savagex/techa...
-rw-r--r-- 4240 .gitattributes
-rw-r--r-- 27 .gitignore
drwxr-xr-x - env
drwxr-xr-x - maps
drwxr-xr-x - models
drwxr-xr-x - scripts
drwxr-xr-x - sound
drwxr-xr-x - textures