]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/mapobjects/trigger/gravity.qc
Merge branch 'master' into Mario/q3compat_sanity
authorMario <mario.mario@y7mail.com>
Fri, 18 Jun 2021 11:12:13 +0000 (21:12 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 18 Jun 2021 11:12:13 +0000 (21:12 +1000)
commit4da0b1d48eaa7e046fed22cba4709dea8dd5616e
tree237bfa434a5c8a30b893c1a7a51acba1cb9bd1fb
parentb2d3d4bf309925b54ac1f177ee9647b2aaf2bca4
parent0086e2f5b478e20e86f1777de3e80f728c3e1dcf
Merge branch 'master' into Mario/q3compat_sanity
qcsrc/client/mapvoting.qc
qcsrc/common/mapinfo.qh
qcsrc/server/command/sv_cmd.qc
qcsrc/server/mapvoting.qc
qcsrc/server/world.qc
qcsrc/server/world.qh
xonotic-common.cfg