]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into cbrutail/map-8bit_arena
authorcbrutail <ruszkai.akos@gmail.com>
Fri, 14 Oct 2011 13:49:41 +0000 (15:49 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Fri, 14 Oct 2011 13:49:41 +0000 (15:49 +0200)
commit600fa247f56b4a0d984c8b77e1578a11c54ce208
tree95ca255ca4408432c4e22a376f182825973d8c5a
parent2045f372930330994e9b2bd2abf9eec06485a24d
parentefa0c0109ae514956c564b35f32873be9e0651dd
Merge branch 'master' into cbrutail/map-8bit_arena