]> 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: 206a618 bfc7e0e)
Merge branch 'master' into Mirio/balance
authorMario <mario@smbclan.net>
Fri, 17 Jun 2016 07:58:36 +0000 (17:58 +1000)
committerMario <mario@smbclan.net>
Fri, 17 Jun 2016 07:58:36 +0000 (17:58 +1000)

Trivial merge