]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'cbrutail/textures-facility114inx-additionals' into cbrutail/map-8bit_arena
authorcbrutail <ruszkai.akos@gmail.com>
Fri, 14 Oct 2011 13:49:52 +0000 (15:49 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Fri, 14 Oct 2011 13:49:52 +0000 (15:49 +0200)
commit17f7b559d80cc95cd72193d769220bb83a6f577e
treeecf7a065d5d43c836f1544c7d7e08b582fe7a363
parent600fa247f56b4a0d984c8b77e1578a11c54ce208
parentb84e07f539c1c03c9477cf8f11768bf93d815734
Merge branch 'cbrutail/textures-facility114inx-additionals' into cbrutail/map-8bit_arena