]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d323ee b8b9d9d)
Merge branch 'Lyberta/URS3' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 23 Sep 2017 03:57:01 +0000 (03:57 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 23 Sep 2017 03:57:01 +0000 (03:57 +0000)
Unified resource system - step 3

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


Trivial merge