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