From: Rudolf Polzer Date: Thu, 9 Feb 2012 12:12:29 +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 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3c39aa374dfbbeb40759ed764bad0f9cd8e2aa8c;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 3c39aa374dfbbeb40759ed764bad0f9cd8e2aa8c