]> 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: 324f75a a861a69)
Merge branch 'master' into debugger/shadow/atelier
authorMirio <opivy@hotmail.de>
Tue, 5 May 2015 12:14:27 +0000 (14:14 +0200)
committerMirio <opivy@hotmail.de>
Tue, 5 May 2015 12:14:27 +0000 (14:14 +0200)

Trivial merge