projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fd6e61d
0ff1afb
)
Merge remote-tracking branch 'origin/Mario/tweaks'
author
Mario <mario@smbclan.net>
Sun, 3 Jul 2016 23:14:52 +0000
(09:14 +1000)
committer
Mario <mario@smbclan.net>
Sun, 3 Jul 2016 23:14:52 +0000
(09:14 +1000)
1
2
qcsrc/server/cl_client.qc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qcsrc/server/cl_client.qc
Simple merge