]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/speed_var
authorMario <mario.mario@y7mail.com>
Fri, 17 Jul 2020 07:33:02 +0000 (17:33 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 17 Jul 2020 07:33:02 +0000 (17:33 +1000)
1  2 
qcsrc/common/stats.qh
qcsrc/ecs/systems/cl_physics.qc

Simple merge
Simple merge