From: Mirio <opivy@hotmail.de>
Date: Mon, 26 Oct 2015 02:30:28 +0000 (+0000)
Subject: Merge branch 'maddin/textures-phillipk2x-fixes' into 'master'
X-Git-Tag: xonotic-v0.8.2~157
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=52e32439febfcc5f78f5e0eeeacbb22f83c4c3b3;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'maddin/textures-phillipk2x-fixes' into 'master'

Maddin/textures phillipk2x fixes

Fixes issue xonotic/xonotic-data.pk3dir#1574 and adds a missing editorimage.

See merge request !49
---

52e32439febfcc5f78f5e0eeeacbb22f83c4c3b3