]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit2dbcd3c5a4a458b9e83f3b037ca1d951f73755c3
tree30af0afd881be60be6fd6284edb9874db1b2dac3
parent9d323ee2bb47d17ece4b133cc498be455772e680
parentb8b9d9d6006669f36c9c9a7387506242a2955904
Merge branch 'Lyberta/URS3' into 'master'

Unified resource system - step 3

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