]> 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: 4ad442e 899b1fd)
Merge branch 'master' into drjaska/mayhem
authordrjaska <drjaska83@gmail.com>
Sat, 29 Jan 2022 06:29:38 +0000 (08:29 +0200)
committerdrjaska <drjaska83@gmail.com>
Sat, 29 Jan 2022 06:29:38 +0000 (08:29 +0200)
1  2 
gamemodes-server.cfg patch | diff1 | diff2 | blob | history

diff --cc gamemodes-server.cfg
Simple merge