Merge branch 'master' into martin-t/mg-solidpen
[xonotic/xonotic-data.pk3dir.git] / qcsrc / .vscode /
drwxr-xr-x   ..
-rw-r--r-- 180 settings.json