]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Fix conflict
authorMirio <opivy@hotmail.de>
Sat, 11 Mar 2017 15:09:56 +0000 (16:09 +0100)
committerMirio <opivy@hotmail.de>
Sat, 11 Mar 2017 15:09:56 +0000 (16:09 +0100)
commitd6349f6ee9ab78e203d8e8cfb9df980641fe979d
tree92055c020c6e9f4aa72d55af4586af4711609675
parent9a2f01b628e58eb9a8e5efbab32714312071261b
parente577dd04604ec2fc5ca2eb6ec5c5be2813da7382
Fix conflict
scripts/shaderlist.txt