projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3103f65
b993b74
)
Merge branch 'master' into Lyberta/TeamplayOverhaul
author
Lyberta <lyberta@lyberta.net>
Sat, 14 Jul 2018 13:37:06 +0000
(16:37 +0300)
committer
Lyberta <lyberta@lyberta.net>
Sat, 14 Jul 2018 13:37:06 +0000
(16:37 +0300)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff