]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e92348f 66fa6a5)
Merge branch 'master' into z411/bai-server
authorz411 <z411@omaera.org>
Sun, 23 Jan 2022 17:18:15 +0000 (14:18 -0300)
committerz411 <z411@omaera.org>
Sun, 23 Jan 2022 17:18:15 +0000 (14:18 -0300)
1  2 
gamemodes-server.cfg patch | diff1 | diff2 | blob | history
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc patch | diff1 | diff2 | blob | history

diff --cc gamemodes-server.cfg
Simple merge