]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2397776 4729704)
Merge branch 'matthiaskrgr/hudsetup'
authorMario <zacjardine@y7mail.com>
Fri, 3 Apr 2015 10:11:14 +0000 (21:11 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 3 Apr 2015 10:11:14 +0000 (21:11 +1100)

Trivial merge