]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9dc2634 7ea3ac7)
Merge remote branch 'origin/samual/fix_crosshair_ring_cvars'
authormand1nga <mand1nga@xonotic.org>
Sun, 10 Apr 2011 20:58:28 +0000 (17:58 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 10 Apr 2011 20:58:28 +0000 (17:58 -0300)

Trivial merge