]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/qcphysics_debugging Mario/qcphysics_debugging
authorMario <mario.mario@y7mail.com>
Sun, 29 Sep 2019 11:24:12 +0000 (21:24 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 29 Sep 2019 11:24:12 +0000 (21:24 +1000)
1  2 
qcsrc/server/client.qc

Simple merge