]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f8a0d8a f280403)
Merge branch 'Mario/mutators' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir...
authorMario <mario.mario@y7mail.com>
Thu, 8 Aug 2013 19:41:53 +0000 (05:41 +1000)
committerMario <mario.mario@y7mail.com>
Thu, 8 Aug 2013 19:41:53 +0000 (05:41 +1000)

Trivial merge