From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 18 Oct 2011 13:18:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/cbrutail/textures-facility114inx-additionals'
X-Git-Tag: xonotic-v0.6.0~72^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c131c807aff103eaf48cd8d84b5ff4bd7882aff5;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/cbrutail/textures-facility114inx-additionals'
---

c131c807aff103eaf48cd8d84b5ff4bd7882aff5