Merge branch 'master' into justin/erbium
[xonotic/xonotic-maps.pk3dir.git] / models / map_catharsis /
drwxr-xr-x   ..
-rw-r--r-- 97959 skarpa.ase
-rw-r--r-- 416733 terrain.ase