]> 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: 0125e52 c4e81cb)
Merge branch 'master' into kuniuthefrogg/boil
authorMirio <opivy@hotmail.de>
Mon, 16 Jan 2017 16:38:08 +0000 (17:38 +0100)
committerMirio <opivy@hotmail.de>
Mon, 16 Jan 2017 16:38:08 +0000 (17:38 +0100)

Trivial merge