projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9fb12c0
3412a9d
)
Merge branch 'master' into martin-t/okc
author
Martin Taibr <taibr.martin@gmail.com>
Fri, 25 Aug 2017 14:49:37 +0000
(16:49 +0200)
committer
Martin Taibr <taibr.martin@gmail.com>
Fri, 25 Aug 2017 14:49:37 +0000
(16:49 +0200)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff