]> 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: 020b899 5ff2b40)
Merge branch 'master' into Mario/mutator_minstagib
authorMario <mario.mario@y7mail.com>
Fri, 19 Apr 2013 04:33:03 +0000 (14:33 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 19 Apr 2013 04:33:03 +0000 (14:33 +1000)

Trivial merge