projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
df33af4
7a3925a
)
Merge branch 'terencehill/shuffleteams_delay' into 'master'
author
Mario <zacjardine@y7mail.com>
Sun, 11 Aug 2019 12:05:32 +0000
(12:05 +0000)
committer
Mario <zacjardine@y7mail.com>
Sun, 11 Aug 2019 12:05:32 +0000
(12:05 +0000)
Shuffleteams delay
See merge request xonotic/xonotic-data.pk3dir!641
1
2
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
Simple merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff