]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'cbrutail/newtexture-facility114inxtrim_green' into cbrutail/map-arena
authorcbrutail <ruszkai.akos@gmail.com>
Mon, 3 Oct 2011 13:56:32 +0000 (15:56 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Mon, 3 Oct 2011 13:56:32 +0000 (15:56 +0200)
commitfbac3c20cccc3c8b6277cf8ca5a4ab51c2ec9a6f
tree0beffbc6cd56dd0002f6a6e9ba7392b2578fbaad
parent586378c0b8484835ac4f8d698cf0538d1ab87348
parentf4333900599a42e18335ce4b6bf97b7d6eca79f1
Merge branch 'cbrutail/newtexture-facility114inxtrim_green' into cbrutail/map-arena