]> 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: 3bbcff2 d1dda0c)
Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Thu, 13 Oct 2016 08:31:57 +0000 (18:31 +1000)
committerMario <mario@smbclan.net>
Thu, 13 Oct 2016 08:31:57 +0000 (18:31 +1000)

Trivial merge