]> 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 | compact (merge: d1a8653 1f30228)
Merge branch 'master' into kuniuthefrogg/boil
authorMirio <opivy@hotmail.de>
Fri, 3 Mar 2017 16:02:21 +0000 (17:02 +0100)
committerMirio <opivy@hotmail.de>
Fri, 3 Mar 2017 16:02:21 +0000 (17:02 +0100)

Trivial merge