]> 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: 8ce8cc7 f167a63)
Merge branch 'master' into Mirio/drain
authorMario <mario.mario@y7mail.com>
Thu, 27 Nov 2014 03:56:15 +0000 (14:56 +1100)
committerMario <mario.mario@y7mail.com>
Thu, 27 Nov 2014 03:56:15 +0000 (14:56 +1100)

Trivial merge