projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f41f81f
305b094
)
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
author
Lyberta <lyberta@lyberta.net>
Thu, 5 Apr 2018 03:10:51 +0000
(06:10 +0300)
committer
Lyberta <lyberta@lyberta.net>
Thu, 5 Apr 2018 03:10:51 +0000
(06:10 +0300)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff