]> 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: c2c3bcc 996bed1)
Merge branch 'drjaska/mayhem' into z411/bai-server
authorz411 <z411@omaera.org>
Thu, 3 Feb 2022 16:40:59 +0000 (13:40 -0300)
committerz411 <z411@omaera.org>
Thu, 3 Feb 2022 16:40:59 +0000 (13:40 -0300)
1  2 
gamemodes-server.cfg patch | diff1 | diff2 | blob | history
qcsrc/server/world.qc patch | diff1 | diff2 | blob | history

diff --cc gamemodes-server.cfg
Simple merge
diff --cc qcsrc/server/world.qc
Simple merge