From: Rudolf Polzer Date: Thu, 9 Dec 2010 21:50:15 +0000 (+0100) Subject: Merge branch 'fruitiex/ctsfix' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3di... X-Git-Tag: xonotic-v0.1.0preview~51^2~20 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=05e3fdcb5f21f6b7e49e95a4231b1e8affb31745;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'fruitiex/ctsfix' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into fruitiex/ctsfix --- 05e3fdcb5f21f6b7e49e95a4231b1e8affb31745