]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c90c2a ce9b5bc)
Merge branch 'master' into Mario/pure_entity_fix 820/head
authorMario <mario.mario@y7mail.com>
Tue, 26 May 2020 14:04:38 +0000 (00:04 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 26 May 2020 14:04:38 +0000 (00:04 +1000)

Trivial merge