]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28125d7 c74b464)
Merge branch 'matthiaskrgr/SE' into 'master'
authorMirio <opivy@hotmail.de>
Mon, 13 Mar 2017 16:05:25 +0000 (16:05 +0000)
committerMirio <opivy@hotmail.de>
Mon, 13 Mar 2017 16:05:25 +0000 (16:05 +0000)
space-elevator: use default damage instead of 1000

See merge request !79


Trivial merge