projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
97fead8
7a10cb5
)
Merge branch 'master' into Lyberta/GivePlayerAmmo
author
Mario <mario@smbclan.net>
Sun, 27 Aug 2017 12:41:08 +0000
(22:41 +1000)
committer
Mario <mario@smbclan.net>
Sun, 27 Aug 2017 12:41:08 +0000
(22:41 +1000)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff