projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
aa37bf1
60722f0
)
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
author
Nikolay S <nick@teichisma.info>
Wed, 29 Jan 2025 10:57:57 +0000
(11:57 +0100)
committer
Nikolay S <nick@teichisma.info>
Wed, 29 Jan 2025 10:57:57 +0000
(11:57 +0100)
1
2
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
Simple merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff