]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Fix merge conflict DefaultUser/doors
authorMirio <opivy@hotmail.de>
Wed, 25 Apr 2018 14:13:37 +0000 (16:13 +0200)
committerMirio <opivy@hotmail.de>
Wed, 25 Apr 2018 14:13:37 +0000 (16:13 +0200)
commit352fd415bce67dd913f2b98acc36177d22c5b38f
tree0b911d699c71d79e5270f6dee742cf2b36f8860e
parent1637dc504a18c0b45d8b24c8be90b781a9a93acf
Fix merge conflict
scripts/entities.ent