From: Mario <zacjardine@y7mail.com>
Date: Tue, 31 Mar 2015 12:49:25 +0000 (+0000)
Subject: Merge branch 'Mario/crosshair_blink_fix' into 'master'
X-Git-Tag: xonotic-v0.8.1~95
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4b7122341c061db67741ab0e05bdabcc0d24c3d0;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/crosshair_blink_fix' into 'master'

Merge branch Mario/crosshair_blink_fix (XXS merge request)

Fixes blinking crosshair while spectating.

See merge request !114
---

4b7122341c061db67741ab0e05bdabcc0d24c3d0