From: Rudolf Polzer Date: Fri, 10 Dec 2010 21:51:58 +0000 (+0100) Subject: Merge remote branch 'origin/fruitiex/miscfixes' into fruitiex/ctsfix X-Git-Tag: xonotic-v0.1.0preview~51^2~17^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6a3c13e48880ad03d3648263b662a48305648523;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/fruitiex/miscfixes' into fruitiex/ctsfix --- 6a3c13e48880ad03d3648263b662a48305648523