]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
fix merge conflicts
authorMirio <opivy@hotmail.de>
Fri, 11 Sep 2015 18:09:21 +0000 (20:09 +0200)
committerMirio <opivy@hotmail.de>
Fri, 11 Sep 2015 18:09:21 +0000 (20:09 +0200)
commit2fa0ac3404a2ebfc08fcc1724cf5322b522ab3dc
tree059b18aba5f7f54c876c20daa00b2a4d854bd4f6
parent494e2b60664186b624f9db860c5603ba75fd94d4
parenta6bc80038b1fe7f63ac2cab39fd6b927053e7803
fix merge conflicts
maps/catharsis.map.options