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