From: Mario Date: Thu, 1 Sep 2016 11:10:05 +0000 (+0000) Subject: Merge branch 'DefaultUser/gametype_votescreen' into 'master' X-Git-Tag: xonotic-v0.8.2~629 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=268f9c69576b6bb929f66d19f0d077d19ba47edd;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'DefaultUser/gametype_votescreen' into 'master' Gametype Votescreen: Fix icons for custom gamemodes and add option for custom icons See merge request !359 --- 268f9c69576b6bb929f66d19f0d077d19ba47edd