Merge branch 'Mario/intrusivelist_objects' into 'master'
authorMario <mario.mario@y7mail.com>
Mon, 20 Jan 2020 07:06:39 +0000 (07:06 +0000)
committerMario <mario.mario@y7mail.com>
Mon, 20 Jan 2020 07:06:39 +0000 (07:06 +0000)
commite23bc2221488ce178edcf0689b41c66418972f63
tree8d6420ff894a6f06ede5fbfe2216895cbcc415bb
parent1a749f9f7d0623b782cd5531f76d9c352cf1d9e3
parentbc91aae1110a375a90c27df5fd48509eb578fb47
Merge branch 'Mario/intrusivelist_objects' into 'master'

Merge branch Mario/intrusivelist_objects (S merge request)

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