]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Mario/qcphysics'
authorMario <mario@smbclan.net>
Sat, 22 Sep 2018 21:50:12 +0000 (07:50 +1000)
committerMario <mario@smbclan.net>
Sat, 22 Sep 2018 21:50:12 +0000 (07:50 +1000)
1  2 
qcsrc/server/client.qc

Simple merge