Merge remote-tracking branch 'origin/samual/serverlist'
[xonotic/xonotic-data.pk3dir.git] / .tx /
drwxr-xr-x   ..
-rw-r--r-- 186 config
-rw-r--r-- 30 merge-base