]> 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: c7d8516 dc43859)
Merge branch 'Mario/qc_droptofloor' into 'master'
authorMario <mario.mario@y7mail.com>
Tue, 11 Oct 2022 11:04:09 +0000 (11:04 +0000)
committerMario <mario.mario@y7mail.com>
Tue, 11 Oct 2022 11:04:09 +0000 (11:04 +0000)
Merge branch Mario/qc_droptofloor (XS merge request)

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

1  2 
qcsrc/server/world.qc patch | diff1 | diff2 | blob | history
qcsrc/server/world.qh patch | diff1 | diff2 | blob | history

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