Merge branch 'Mario/target_teleporter_v2' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 27 Nov 2017 01:29:57 +0000 (01:29 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 27 Nov 2017 01:29:57 +0000 (01:29 +0000)
commit5c9f51cd3a9f0b63733ee7b81649e81872a86765
tree82be200b249e0a13fad7dc5b95433fa91bc6b320
parent8fb3ecf43e9a6605f92a187e97a550f8bd8f7a5a
parente87123e5fba23f7a8907e6fbab241c5eec5be168
Merge branch 'Mario/target_teleporter_v2' into 'master'

Merge branch Mario/target_teleporter_v2 (S merge request)

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