]> 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: 9da6698 920b58b)
Merge branch 'master' into kuniuthefrogg/boil
authorMirio <opivy@hotmail.de>
Wed, 23 Nov 2016 15:47:03 +0000 (16:47 +0100)
committerMirio <opivy@hotmail.de>
Wed, 23 Nov 2016 15:47:03 +0000 (16:47 +0100)

Trivial merge