Merge branch 'sev/crosshairs' into 'master'
authorMario <zacjardine@y7mail.com>
Wed, 4 Feb 2015 02:54:57 +0000 (02:54 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 4 Feb 2015 02:54:57 +0000 (02:54 +0000)
commitd4713d5fb349f31d509d8bb54a3129f0786e7ca7
tree0fad45929e488877c340ff5b7c04d5a07bb4c506
parent93e50869fb3bd49cf533584cb9603e19807522f3
parentc810adb1491384e241e689a63e2eec0c69ddc892
Merge branch 'sev/crosshairs' into 'master'

Crosshair sourcefiles

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

See merge request !3