From: Rudolf Polzer Date: Sun, 26 Jun 2011 18:23:36 +0000 (+0200) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.5.0~159^2~15^2~14 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b9db149ac4e5c9593771ee3e16b82a094eff0529;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir --- b9db149ac4e5c9593771ee3e16b82a094eff0529