From: Rudolf Polzer Date: Fri, 28 Oct 2011 19:29:54 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~35^2~78 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d2f81f24cd5a7bc8949a07a5e75b3dc2cb98e5b6;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- d2f81f24cd5a7bc8949a07a5e75b3dc2cb98e5b6