Merge branch 'maddin/textures-phillipk2x-fixes' into 'master'
authorMirio <opivy@hotmail.de>
Mon, 26 Oct 2015 02:30:28 +0000 (02:30 +0000)
committerMirio <opivy@hotmail.de>
Mon, 26 Oct 2015 02:30:28 +0000 (02:30 +0000)
commit52e32439febfcc5f78f5e0eeeacbb22f83c4c3b3
tree1307bc889401b52bbae390f6fe95eb9bdf4a68c3
parentc64484ceacb4fd694fd5d6738e96eeac8ac47c1c
parent2fcaae1e5110551303783f85f5d7a8c54da36d44
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