From: mand1nga <mand1nga@xonotic.org>
Date: Sun, 10 Apr 2011 20:58:28 +0000 (-0300)
Subject: Merge remote branch 'origin/samual/fix_crosshair_ring_cvars'
X-Git-Tag: xonotic-v0.5.0~307^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3a09978cb735b1c7598ff0d6c4f9caf8e161a42a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/samual/fix_crosshair_ring_cvars'
---

3a09978cb735b1c7598ff0d6c4f9caf8e161a42a