projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e9e8607
6ca8a21
)
Merge branch 'Mario/gametypes' into 'master'
author
Mario <mario.mario@y7mail.com>
Fri, 17 Jul 2020 19:10:20 +0000
(19:10 +0000)
committer
Mario <mario.mario@y7mail.com>
Fri, 17 Jul 2020 19:10:20 +0000
(19:10 +0000)
Merge branch Mario/gametypes (L merge request)
See merge request xonotic/xonotic-data.pk3dir!840
Trivial merge