]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into cbrutail/map-8bit_arena
authorcbrutail <ruszkai.akos@gmail.com>
Fri, 2 Dec 2011 23:23:07 +0000 (00:23 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Fri, 2 Dec 2011 23:23:07 +0000 (00:23 +0100)
commit51ad94a7427eb1633c8b5305631c829f907818e9
tree1916d00a477e7e3bd79aa72297a86355d5127b57
parentb1e85ece7c4fb056dfb68f357262a491d1c3ea0f
parent7116e6cb8c54451796ea88699fee3c6d70fe71e9
Merge branch 'master' into cbrutail/map-8bit_arena