]> 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: f945ae4 68b050a)
Merge branch 'terencehill/freezetag_updates' into 'master'
authorterencehill <piuntn@gmail.com>
Mon, 24 May 2021 10:58:22 +0000 (10:58 +0000)
committerterencehill <piuntn@gmail.com>
Mon, 24 May 2021 10:58:22 +0000 (10:58 +0000)
Freezetag updates

See merge request xonotic/xonotic-data.pk3dir!896

1  2 
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc patch | diff1 | diff2 | blob | history
qcsrc/server/world.qc patch | diff1 | diff2 | blob | history

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