]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1462e4c 5671892)
Merge branch 'matthiaskrgr/hudsetup'
authorMario <zacjardine@y7mail.com>
Sun, 5 Apr 2015 20:23:21 +0000 (06:23 +1000)
committerMario <zacjardine@y7mail.com>
Sun, 5 Apr 2015 20:23:21 +0000 (06:23 +1000)

Trivial merge