From: cbrutail <ruszkai.akos@gmail.com>
Date: Mon, 3 Oct 2011 13:56:32 +0000 (+0200)
Subject: Merge branch 'cbrutail/newtexture-facility114inxtrim_green' into cbrutail/map-arena
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fbac3c20cccc3c8b6277cf8ca5a4ab51c2ec9a6f;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'cbrutail/newtexture-facility114inxtrim_green' into cbrutail/map-arena
---

fbac3c20cccc3c8b6277cf8ca5a4ab51c2ec9a6f