]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb46db3 01c31aa)
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 patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/client.qc
Simple merge