From: nyov Date: Sat, 3 Dec 2011 19:16:14 +0000 (+0100) Subject: Merge branch 'master' into nyov/dedicated-startupscreen X-Git-Tag: xonotic-v0.7.0~356^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=63720f610fa262c3510804469af37ff024d444d4;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into nyov/dedicated-startupscreen --- 63720f610fa262c3510804469af37ff024d444d4