From: Mario <mario.mario@y7mail.com>
Date: Mon, 20 Jan 2020 07:06:39 +0000 (+0000)
Subject: Merge branch 'Mario/intrusivelist_objects' into 'master'
X-Git-Tag: xonotic-v0.8.5~1161^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e23bc2221488ce178edcf0689b41c66418972f63;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/intrusivelist_objects' into 'master'

Merge branch Mario/intrusivelist_objects (S merge request)

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

e23bc2221488ce178edcf0689b41c66418972f63