]> 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: 9f041f1 f167a63)
Merge branch 'master' into mirio/implosion
authorMirio <opivy@hotmail.de>
Thu, 27 Nov 2014 00:02:50 +0000 (01:02 +0100)
committerMirio <opivy@hotmail.de>
Thu, 27 Nov 2014 00:02:50 +0000 (01:02 +0100)

Trivial merge