From: Rudolf Polzer Date: Sat, 5 Feb 2011 19:13:46 +0000 (+0100) Subject: Merge remote branch 'origin/terencehill/short_sliders_fix' X-Git-Tag: xonotic-v0.5.0~311^2~40^2~7 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bfd524db6afac042f0d0b6a65f717b9b21af964a;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/terencehill/short_sliders_fix' --- bfd524db6afac042f0d0b6a65f717b9b21af964a