]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/no_engine_physics
authorMario <mario.mario@y7mail.com>
Sun, 25 Sep 2022 05:30:59 +0000 (15:30 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 25 Sep 2022 05:30:59 +0000 (15:30 +1000)
1  2 
qcsrc/lib/csqcmodel/cl_player.qc
qcsrc/server/client.qc
xonotic-client.cfg

Simple merge
Simple merge
Simple merge