From: cbrutail <ruszkai.akos@gmail.com>
Date: Fri, 14 Oct 2011 13:49:52 +0000 (+0200)
Subject: Merge branch 'cbrutail/textures-facility114inx-additionals' into cbrutail/map-8bit_arena
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=17f7b559d80cc95cd72193d769220bb83a6f577e;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'cbrutail/textures-facility114inx-additionals' into cbrutail/map-8bit_arena
---

17f7b559d80cc95cd72193d769220bb83a6f577e