]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit6ad9dd6fa31e6c5c935c372195580c60470d2e21
treef9237bd4756a72af469e55802d2411085af0115e
parent85994f9a0c006d68ba77360bb2467f9ec9a7ec9d
parent81073691003a3c4405ec28a1dc01e9fe516e3f9f
Merge branch 'Lyberta/URS2' into 'master'

Unified resource system - step 2

See merge request !474