From: Rudolf Polzer Date: Tue, 1 Mar 2011 18:09:46 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/samual/crosshair_ring_updates' X-Git-Tag: xonotic-v0.5.0~309^2~17^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cc1a3ab87fdc6efac20c1224fffdfbe8379b44fb;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/samual/crosshair_ring_updates' --- cc1a3ab87fdc6efac20c1224fffdfbe8379b44fb