]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/q3compat_sanity
authorMario <mario.mario@y7mail.com>
Sun, 1 Nov 2020 06:01:28 +0000 (16:01 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 1 Nov 2020 06:01:28 +0000 (16:01 +1000)
commit6bf2ddbf7560ca09c4529a4b243e9b34cf83232c
tree3b63e59e9a8c6789f2fd800a9b87b43233203491
parentc859a2a87cbeb3dd30f402782cf7e59d132b1b81
parent774440a5f1736de1fa72499ff7358d123b8f99fb
Merge branch 'master' into Mario/q3compat_sanity
qcsrc/client/mapvoting.qc
qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh
qcsrc/server/world.qc
qcsrc/server/world.qh