]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/q3compat_sanity
authorMario <mario.mario@y7mail.com>
Fri, 6 Nov 2020 14:12:18 +0000 (00:12 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 6 Nov 2020 14:12:18 +0000 (00:12 +1000)
1  2 
qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh

Simple merge
Simple merge