]> 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: 05e4d93 939d736)
Merge branch 'Juhu/battle-royale' into Juhu/battle-royale_server Juhu/battle-royale_server
authorJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Wed, 21 Jun 2023 23:59:47 +0000 (01:59 +0200)
committerJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Wed, 21 Jun 2023 23:59:47 +0000 (01:59 +0200)
1  2 
qcsrc/server/command/sv_cmd.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/command/sv_cmd.qc
Simple merge