]> 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: ce9b5bc f7673c1)
Merge branch 'Mario/pure_entity_fix' into 'master'
authorMario <mario.mario@y7mail.com>
Tue, 26 May 2020 14:13:38 +0000 (14:13 +0000)
committerMario <mario.mario@y7mail.com>
Tue, 26 May 2020 14:13:38 +0000 (14:13 +0000)
Merge branch Mario/pure_entity_fix (XXS merge request)

See merge request xonotic/xonotic-data.pk3dir!820


Trivial merge