From: Rudolf Polzer Date: Tue, 7 Feb 2012 22:41:25 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~74^2~8^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=40e83082fa1797a0f55de18cda4f737af2121c19;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 40e83082fa1797a0f55de18cda4f737af2121c19