]> 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: e9f0618 4e7848b)
Merge branch 'packer/warpzones' into 'master'
authorMirio <opivy@hotmail.de>
Sun, 12 Mar 2017 22:02:20 +0000 (22:02 +0000)
committerMirio <opivy@hotmail.de>
Sun, 12 Mar 2017 22:02:20 +0000 (22:02 +0000)
Packer/warpzones

See merge request !75


Trivial merge