From: Rudolf Polzer Date: Fri, 14 Dec 2012 10:16:30 +0000 (+0100) Subject: Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.7.0~191 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=21669f743378b255e4f984222de65be549fda772;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 21669f743378b255e4f984222de65be549fda772