]> 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: 1f30228 1bafd5a)
Merge branch 'kuniuthefrogg/boil' into 'master'
authorMirio <opivy@hotmail.de>
Fri, 3 Mar 2017 16:20:48 +0000 (16:20 +0000)
committerMirio <opivy@hotmail.de>
Fri, 3 Mar 2017 16:20:48 +0000 (16:20 +0000)
kuniuthefrogg/boil

See merge request !58


Trivial merge