From: Rudolf Polzer Date: Mon, 25 Apr 2011 18:20:55 +0000 (+0200) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.5.0~264^2~20 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b349b7fc80a06729722f546985b84b86da2e8e5e;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir --- b349b7fc80a06729722f546985b84b86da2e8e5e