]> 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 | compact (merge: 24f7a5b e69d5a7)
Merge branch 'master' into Mario/mutators2
authorMario <mario.mario@y7mail.com>
Wed, 4 Jun 2014 21:29:11 +0000 (07:29 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 4 Jun 2014 21:29:11 +0000 (07:29 +1000)

Trivial merge