]> 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: c379f1e e430684)
Merge branch 'master' into Mario/qcphysics_tweaks 612/head
authorMario <mario@smbclan.net>
Sat, 20 Oct 2018 18:36:19 +0000 (04:36 +1000)
committerMario <mario@smbclan.net>
Sat, 20 Oct 2018 18:36:19 +0000 (04:36 +1000)

Trivial merge