]> 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: 774d70a 48c944b)
Merge branch 'master' into debugger/shadow/atelier
authorMirio <opivy@hotmail.de>
Thu, 9 Jul 2015 19:10:24 +0000 (21:10 +0200)
committerMirio <opivy@hotmail.de>
Thu, 9 Jul 2015 19:10:24 +0000 (21:10 +0200)

Trivial merge