]> de.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: fae0768 213878b)
Merge branch 'master' into Mario/qc_camstuff
authorMario <mario.mario@y7mail.com>
Wed, 18 Sep 2019 21:59:20 +0000 (07:59 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 18 Sep 2019 21:59:20 +0000 (07:59 +1000)

Trivial merge