projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c16635f
b792d33
)
Merge branch 'master' into Lyberta/TeamplayOverhaul
author
Lyberta <lyberta@lyberta.net>
Sun, 18 Mar 2018 04:59:52 +0000
(07:59 +0300)
committer
Lyberta <lyberta@lyberta.net>
Sun, 18 Mar 2018 04:59:52 +0000
(07:59 +0300)
1
2
qcsrc/server/client.qc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qcsrc/server/client.qc
Simple merge