]> 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: 1c32026 52e3243)
Merge branch 'master' into kuniuthefrogg/atomforge
authorMirio <opivy@hotmail.de>
Tue, 27 Oct 2015 10:10:13 +0000 (11:10 +0100)
committerMirio <opivy@hotmail.de>
Tue, 27 Oct 2015 10:10:13 +0000 (11:10 +0100)

Trivial merge