]> 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: fe52acf e577dd0)
Fix conflict
authorMirio <opivy@hotmail.de>
Sat, 11 Mar 2017 15:13:58 +0000 (16:13 +0100)
committerMirio <opivy@hotmail.de>
Sat, 11 Mar 2017 15:13:58 +0000 (16:13 +0100)

Trivial merge