From: cbrutail <ruszkai.akos@gmail.com>
Date: Thu, 6 Oct 2011 20:38:51 +0000 (+0200)
Subject: Merge branch 'cbrutail/texturesex2x-greentrims' into cbrutail/map-8bit_arena
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1a99e0315a6445456d901688a78162cc1ad236af;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'cbrutail/texturesex2x-greentrims' into cbrutail/map-8bit_arena
---

1a99e0315a6445456d901688a78162cc1ad236af