projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1e848bd
65493c1
)
Merge branch 'master' into Lyberta/KillSound
author
Lyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 15:53:28 +0000
(18:53 +0300)
committer
Lyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 15:53:28 +0000
(18:53 +0300)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff