From: mand1nga <mand1nga@xonotic.org>
Date: Sun, 21 Aug 2011 02:54:31 +0000 (-0300)
Subject: Merge remote-tracking branch 'origin/samual/fix_crosshair_hitindication'
X-Git-Tag: xonotic-v0.5.0~110
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=72d3ad3b579f082d0421d04758feddb5e726cf04;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/samual/fix_crosshair_hitindication'
---

72d3ad3b579f082d0421d04758feddb5e726cf04