From: Mirio <opivy@hotmail.de>
Date: Thu, 1 Oct 2015 09:21:41 +0000 (+0000)
Subject: Merge branch 'maddin/map-warfare' into 'master'
X-Git-Tag: xonotic-v0.8.2~162
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=553164dcc551f529d0e28a335a67b9ee5d4f0ef2;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'maddin/map-warfare' into 'master'

Maddin/map warfare

This fixes the remaining issues of #102 and adds some minor visual improvements (outer and inner terrain parts mainly).

See merge request !45
---

553164dcc551f529d0e28a335a67b9ee5d4f0ef2