]> 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: 4197c6a 7b4e52d)
Merge branch 'packer/dance-caulked' into 'master'
authorMirio <opivy@hotmail.de>
Sun, 19 Mar 2017 18:30:02 +0000 (18:30 +0000)
committerMirio <opivy@hotmail.de>
Sun, 19 Mar 2017 18:30:02 +0000 (18:30 +0000)
packer/dance-caulked

See merge request !93


Trivial merge