]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'cbrutail/warpzone-green' into cbrutail/map-8bit_arena
authorcbrutail <ruszkai.akos@gmail.com>
Sun, 9 Oct 2011 13:32:47 +0000 (15:32 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Sun, 9 Oct 2011 13:32:47 +0000 (15:32 +0200)
commitd3b7480dc94165debc97e4b93b2dc572ed2dad15
tree27128a962d48840432cbedf33284ef33dd4d9fa8
parentb5dc22057b4652101cbbba262d0aaa9ee226a7c8
parent5adfe4fd8c73b2acd001b72de3908ffde021a064
Merge branch 'cbrutail/warpzone-green' into cbrutail/map-8bit_arena