]> 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: 54ce6bb ba17f8c)
Merge branch 'master' into Mario/qcphysics
authorMario <mario.mario@y7mail.com>
Sun, 15 Sep 2019 06:10:17 +0000 (16:10 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 15 Sep 2019 06:10:17 +0000 (16:10 +1000)

Trivial merge