]> 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: 944219c b1c2a0d)
Merge branch 'master' into Mario/qc_camstuff
authorMario <mario@smbclan.net>
Wed, 28 Aug 2019 08:52:32 +0000 (18:52 +1000)
committerMario <mario@smbclan.net>
Wed, 28 Aug 2019 08:52:32 +0000 (18:52 +1000)

Trivial merge