From: Mario <zacjardine@y7mail.com>
Date: Sat, 23 Sep 2017 03:57:01 +0000 (+0000)
Subject: Merge branch 'Lyberta/URS3' into 'master'
X-Git-Tag: xonotic-v0.8.5~2461
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2dbcd3c5a4a458b9e83f3b037ca1d951f73755c3;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Lyberta/URS3' into 'master'

Unified resource system - step 3

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

2dbcd3c5a4a458b9e83f3b037ca1d951f73755c3