]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4312e9e e485bca)
Merge branch 'master' into LegendaryGuard/ttt
authorLegendaryGuard <rootuser999@gmail.com>
Wed, 5 Jan 2022 18:58:24 +0000 (19:58 +0100)
committerLegendaryGuard <rootuser999@gmail.com>
Wed, 5 Jan 2022 18:58:24 +0000 (19:58 +0100)
1  2 
gamemodes-server.cfg patch | diff1 | diff2 | blob | history
qcsrc/common/ent_cs.qc patch | diff1 | diff2 | blob | history
qcsrc/server/world.qc patch | diff1 | diff2 | blob | history

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