projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
679aff2
a7bdc71
)
Merge branch 'master' into Mario/gameover_fixes
author
Mario <mario@smbclan.net>
Fri, 24 Jun 2016 23:10:50 +0000
(09:10 +1000)
committer
Mario <mario@smbclan.net>
Fri, 24 Jun 2016 23:10:50 +0000
(09:10 +1000)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff