]> 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: e1be03c c0c3ee0)
Merge branch 'master' into Justin/erbium
authorMirio <opivy@hotmail.de>
Tue, 31 Jan 2017 12:56:22 +0000 (13:56 +0100)
committerMirio <opivy@hotmail.de>
Tue, 31 Jan 2017 12:56:22 +0000 (13:56 +0100)

Trivial merge