]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/mapobjects/trigger/jumppads.qc
Merge branch 'master' into bones_was_here/q3compat
authorbones_was_here <bones_was_here@xa.org.au>
Fri, 2 Oct 2020 03:15:39 +0000 (13:15 +1000)
committerbones_was_here <bones_was_here@xa.org.au>
Fri, 2 Oct 2020 03:15:39 +0000 (13:15 +1000)
commit8bed39a680d18ef81d42952d21197647c4c91721
treef09233bd6e5dfda9b8f2f5c2fe89f6b9794ef3b8
parent837c32688ad1f1548e7d4cf4339691181c2bb6ff
parent791549348070a5941dd51419b8d285518e2d4437
Merge branch 'master' into bones_was_here/q3compat