]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/target_teleporter_v2
authorMario <mario@smbclan.net>
Sun, 27 Aug 2017 14:08:11 +0000 (00:08 +1000)
committerMario <mario@smbclan.net>
Sun, 27 Aug 2017 14:08:11 +0000 (00:08 +1000)
1  2 
qcsrc/common/triggers/teleporters.qc

Simple merge