]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/no_engine_physics
authorMario <mario.mario@y7mail.com>
Mon, 21 Nov 2022 01:53:34 +0000 (11:53 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 21 Nov 2022 01:53:34 +0000 (11:53 +1000)
1  2 
qcsrc/common/physics/movetypes/movetypes.qc
qcsrc/server/client.qc

Simple merge