]> 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: 5a19110 ea82b59)
Merge branch 'master' into Mario/client_entnum Mario/client_entnum
authorMario <mario.mario@y7mail.com>
Thu, 1 Dec 2022 12:07:48 +0000 (22:07 +1000)
committerMario <mario.mario@y7mail.com>
Thu, 1 Dec 2022 12:07:48 +0000 (22:07 +1000)

Trivial merge