From: Mario Date: Tue, 14 Jun 2016 13:42:28 +0000 (+1000) Subject: Merge branch 'master' into Mario/fullbright_skins X-Git-Tag: xonotic-v0.8.2~804^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F311%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into Mario/fullbright_skins --- 30651895eb80aab99657da34d8c8cebd859bbc78