]> 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: ca74022 07cfcba)
Merge branch 'Mario/crosshair_blink_fix' into 'master'
authorMario <zacjardine@y7mail.com>
Tue, 31 Mar 2015 12:49:25 +0000 (12:49 +0000)
committerMario <zacjardine@y7mail.com>
Tue, 31 Mar 2015 12:49:25 +0000 (12:49 +0000)
Merge branch Mario/crosshair_blink_fix (XXS merge request)

Fixes blinking crosshair while spectating.

See merge request !114


Trivial merge