]> 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: de5d5e6 c35a168)
Merge branch 'master' into itsme/vorix
authorMario <mario.mario@y7mail.com>
Sat, 29 Nov 2014 13:17:18 +0000 (00:17 +1100)
committerMario <mario.mario@y7mail.com>
Sat, 29 Nov 2014 13:17:18 +0000 (00:17 +1100)

Trivial merge