]> 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: abd46fc 5087b7e)
Merge branch 'master' into kuniuthefrogg/boil
authorMirio <opivy@hotmail.de>
Tue, 17 Jan 2017 14:19:49 +0000 (15:19 +0100)
committerMirio <opivy@hotmail.de>
Tue, 17 Jan 2017 14:19:49 +0000 (15:19 +0100)

Trivial merge