From: Mario <zacjardine@y7mail.com>
Date: Wed, 4 Feb 2015 02:54:57 +0000 (+0000)
Subject: Merge branch 'sev/crosshairs' into 'master'
X-Git-Tag: xonotic-v0.8.1~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d4713d5fb349f31d509d8bb54a3129f0786e7ca7;p=xonotic%2Fmediasource.git

Merge branch 'sev/crosshairs' into 'master'

Crosshair sourcefiles

The sourcefiles for xonotic/xonotic-data.pk3dir!103

See merge request !3
---

d4713d5fb349f31d509d8bb54a3129f0786e7ca7