]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into cbrutail/map-8bit_arena
authorcbrutail <ruszkai.akos@gmail.com>
Thu, 17 May 2012 21:44:58 +0000 (23:44 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Thu, 17 May 2012 21:44:58 +0000 (23:44 +0200)
commit260fa32c313a40654cf404e52b2c828e7330818e
tree256c124b64051063aabae178bac437d221fb3264
parent28371cac49e3eaa8180b0b48b6cc0f322c7a542e
parentfb4b0e3abb8191950b0d64a00e91a7cc0d8ce7fd
Merge branch 'master' into cbrutail/map-8bit_arena

Wtf, master merge needs commit? oO