]> 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: e7c0ece a861a69)
Merge branch 'master' into debugger/go
authorMirio <opivy@hotmail.de>
Thu, 11 Jun 2015 11:20:33 +0000 (13:20 +0200)
committerMirio <opivy@hotmail.de>
Thu, 11 Jun 2015 11:20:33 +0000 (13:20 +0200)

Trivial merge