From: Rudolf Polzer Date: Fri, 6 Jan 2012 14:57:51 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~188^2~22 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5119ca4560e0c9864b4a88c91297a43e41947cc2;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 5119ca4560e0c9864b4a88c91297a43e41947cc2