]> 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: ea48961 8ef775b)
Merge branch 'sev/new_crosshairs'
authorMario <zacjardine@y7mail.com>
Tue, 3 Feb 2015 10:51:50 +0000 (21:51 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 3 Feb 2015 10:51:50 +0000 (21:51 +1100)

Trivial merge