]> 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: b4c7848 24b0616)
Merge branch 'master' into mirio/implosion
authorMirio <opivy@hotmail.de>
Tue, 18 Nov 2014 15:50:58 +0000 (16:50 +0100)
committerMirio <opivy@hotmail.de>
Tue, 18 Nov 2014 15:50:58 +0000 (16:50 +0100)

Trivial merge