From: Mirio <opivy@hotmail.de>
Date: Mon, 13 Mar 2017 16:14:29 +0000 (+0000)
Subject: Merge branch 'matthiaskrgr/atelier' into 'master'
X-Git-Tag: xonotic-v0.8.2~57
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=94dfb73cd0b478aecebe680db436d34e9eac1ad5;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'matthiaskrgr/atelier' into 'master'

atelier: fix texture misalignment

See merge request !80
---

94dfb73cd0b478aecebe680db436d34e9eac1ad5