]> 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: 9605111 94dfb73)
Merge branch 'master' into matthiaskrgr/erbium 78/head
authorMirio <opivy@hotmail.de>
Mon, 13 Mar 2017 16:16:14 +0000 (17:16 +0100)
committerMirio <opivy@hotmail.de>
Mon, 13 Mar 2017 16:16:14 +0000 (17:16 +0100)

Trivial merge