]> 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: 7f04226 6939600)
Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Wed, 7 Dec 2016 14:18:04 +0000 (00:18 +1000)
committerMario <mario@smbclan.net>
Wed, 7 Dec 2016 14:18:04 +0000 (00:18 +1000)

Trivial merge