]> 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: dbd0172 cd7644a)
Merge branch 'packer/space-elevator' into 'master'
authorMirio <opivy@hotmail.de>
Sat, 18 Mar 2017 12:34:19 +0000 (12:34 +0000)
committerMirio <opivy@hotmail.de>
Sat, 18 Mar 2017 12:34:19 +0000 (12:34 +0000)
lightgrid box and clips

See merge request !89


Trivial merge