]> 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: 278f544 d8d184e)
Merge branch 'master' into mario/mutator_minstagib
authorMario <mario.mario@y7mail.com>
Sat, 26 Jan 2013 03:35:58 +0000 (14:35 +1100)
committerMario <mario.mario@y7mail.com>
Sat, 26 Jan 2013 03:35:58 +0000 (14:35 +1100)

Trivial merge