]> de.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: 8ba89bd 3361c3a)
Merge branch 'master' into Mario/q3compat_sanity
authorMario <mario.mario@y7mail.com>
Sat, 31 Jul 2021 05:56:21 +0000 (15:56 +1000)
committerMario <mario.mario@y7mail.com>
Sat, 31 Jul 2021 05:56:21 +0000 (15:56 +1000)
1  2 
qcsrc/common/mapinfo.qc patch | diff1 | diff2 | blob | history
qcsrc/server/command/sv_cmd.qc patch | diff1 | diff2 | blob | history
qcsrc/server/world.qc patch | diff1 | diff2 | blob | history

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