]> 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: 7cc7a14 def5baa)
Merge branch 'LegendaryGuard/ttt' into LegendaryGuard/bai_mod
authorLegendaryGuard <rootuser999@gmail.com>
Mon, 26 Apr 2021 18:15:52 +0000 (20:15 +0200)
committerLegendaryGuard <rootuser999@gmail.com>
Mon, 26 Apr 2021 18:15:52 +0000 (20:15 +0200)
1  2 
gamemodes-server.cfg patch | diff1 | diff2 | blob | history

diff --cc gamemodes-server.cfg
Simple merge