Merge branch 'master' into martin-t/example-config
[xonotic/xonotic.git] / misc / logos / icons_xpm /
drwxr-xr-x   ..
-rw-r--r-- 2589 xonotic_32.xpm