]> 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: 85994f9 8107369)
Merge branch 'Lyberta/URS2' into 'master'
authorTimePath <andrew.hardaker1995@gmail.com>
Fri, 1 Sep 2017 23:47:48 +0000 (23:47 +0000)
committerTimePath <andrew.hardaker1995@gmail.com>
Fri, 1 Sep 2017 23:47:48 +0000 (23:47 +0000)
Unified resource system - step 2

See merge request !474


Trivial merge