]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2778e1a de3c757)
Merge branch 'matthiaskrgr/silentsiege' into 'master'
authorMirio <opivy@hotmail.de>
Mon, 7 Sep 2015 13:45:58 +0000 (13:45 +0000)
committerMirio <opivy@hotmail.de>
Mon, 7 Sep 2015 13:45:58 +0000 (13:45 +0000)
Matthiaskrgr/silentsiege fixes

fix getting stuck for real this time (checked that the final pk3 actually works), also fix 2 see-through brushes.

See merge request !39


Trivial merge