From: Rudolf Polzer Date: Sun, 16 Oct 2011 12:22:02 +0000 (+0200) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~40^2~34 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8029e74a0ebb935b02b4a8a6310f8677663599b5;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir --- 8029e74a0ebb935b02b4a8a6310f8677663599b5