]> 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: d6349f6 3f0db00)
Merge branch 'master' into debugger/aurora_ctf debugger/aurora_ctf
authorMirio <opivy@hotmail.de>
Tue, 11 Apr 2017 11:12:09 +0000 (13:12 +0200)
committerMirio <opivy@hotmail.de>
Tue, 11 Apr 2017 11:12:09 +0000 (13:12 +0200)

Trivial merge