From: Mario <zacjardine@y7mail.com>
Date: Tue, 3 Feb 2015 10:51:50 +0000 (+1100)
Subject: Merge branch 'sev/new_crosshairs'
X-Git-Tag: xonotic-v0.8.1~127
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=647dc46763c20178c5d9623f152671cfa1655277;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'sev/new_crosshairs'
---

647dc46763c20178c5d9623f152671cfa1655277