projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
8d6f219
b86c4e4
)
Merge branch 'master' into martin-t/globals
author
Martin Taibr <taibr.martin@gmail.com>
Wed, 28 Nov 2018 14:02:09 +0000
(15:02 +0100)
committer
Martin Taibr <taibr.martin@gmail.com>
Wed, 28 Nov 2018 14:02:09 +0000
(15:02 +0100)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff