]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: c64484c 2fcaae1)
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)
Maddin/textures phillipk2x fixes

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

See merge request !49


Trivial merge