Merge branch 'master' into divVerent/crypto2
[xonotic/xonotic.git] / misc / logos / icons_xpm / xonotic_32.xpm
misc/logos/icons_xpm/xonotic_32.xpm