projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1d7f3d3
38a6a16
)
Merge branch 'terencehill/bot_ai' into 'master'
author
terencehill <piuntn@gmail.com>
Sat, 8 Dec 2018 12:12:33 +0000
(13:12 +0100)
committer
terencehill <piuntn@gmail.com>
Sat, 8 Dec 2018 12:14:37 +0000
(13:14 +0100)
1
2
qcsrc/server/client.qc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qcsrc/server/client.qc
Simple merge