From: Rudolf Polzer Date: Thu, 20 Jan 2011 12:56:34 +0000 (+0100) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.5.0~316^2~56 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=166d02f84387480da68ddc60346af1202297ce19;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir --- 166d02f84387480da68ddc60346af1202297ce19