From: TimePath Date: Fri, 1 Sep 2017 23:47:48 +0000 (+0000) Subject: Merge branch 'Lyberta/URS2' into 'master' X-Git-Tag: xonotic-v0.8.5~2488 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6ad9dd6fa31e6c5c935c372195580c60470d2e21;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'Lyberta/URS2' into 'master' Unified resource system - step 2 See merge request !474 --- 6ad9dd6fa31e6c5c935c372195580c60470d2e21