projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
284c92d
d713052
)
Merge remote-tracking branch 'origin/DefaultUser/ca_spectator_fix'
author
Mario <mario@smbclan.net>
Sun, 3 Jul 2016 23:13:54 +0000
(09:13 +1000)
committer
Mario <mario@smbclan.net>
Sun, 3 Jul 2016 23:13:54 +0000
(09:13 +1000)
1
2
qcsrc/server/mutators/mutator/gamemode_ca.qc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qcsrc/server/mutators/mutator/gamemode_ca.qc
Simple merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff