]> 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 | combined (merge: 5d098c4 8221d04)
Merge branch 'matthiaskrgr/atelier' into 'master'
authorMirio <opivy@hotmail.de>
Mon, 7 Sep 2015 13:41:10 +0000 (13:41 +0000)
committerMirio <opivy@hotmail.de>
Mon, 7 Sep 2015 13:41:10 +0000 (13:41 +0000)
Matthiaskrgr/atelier remove "respawnrings" under items, make light-models solid for bullets.

See merge request !36


Trivial merge