projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
aa95e82
71d3b26
)
Merge branch 'master' into Mario/qcphysics
author
Mario <mario.mario@y7mail.com>
Tue, 7 Jan 2020 13:12:55 +0000
(23:12 +1000)
committer
Mario <mario.mario@y7mail.com>
Tue, 7 Jan 2020 13:12:55 +0000
(23:12 +1000)
1
2
qcsrc/server/client.qc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qcsrc/server/client.qc
Simple merge