]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/ecs_halfbaked
authorMario <zacjardine@y7mail.com>
Sat, 15 Sep 2018 00:29:56 +0000 (10:29 +1000)
committerMario <zacjardine@y7mail.com>
Sat, 15 Sep 2018 00:29:56 +0000 (10:29 +1000)
1  2 
qcsrc/ecs/systems/physics.qc
qcsrc/ecs/systems/sv_physics.qc

Simple merge
Simple merge