]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Sat, 18 Mar 2017 19:57:31 +0000 (22:57 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 18 Mar 2017 19:57:31 +0000 (22:57 +0300)
commit637077cc3328cca1aaa6782a85371ae5304bb0ab
treebb3a076936ffa37faf24613226d698eda65531b6
parentb6dbe5b9dacd15b57212b5ac5a436471185b81c0
parent81cb3d054dc63a71175f86d2ab0a9f461e45bcfe
Merge branch 'master' into Lyberta/Survival
maps/finalrage.mapinfo
maps/implosion.mapinfo