]> git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 93e5086 c810adb)
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)
Crosshair sourcefiles

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

See merge request !3


Trivial merge