]> 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: e430684 0711025)
Merge branch 'Mario/qcphysics_tweaks' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 20 Oct 2018 18:50:04 +0000 (18:50 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 20 Oct 2018 18:50:04 +0000 (18:50 +0000)
Merge branch Mario/qcphysics_tweaks (S merge request)

See merge request xonotic/xonotic-data.pk3dir!612


Trivial merge