]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16ff778 a3d7cb5)
Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Sat, 24 Dec 2016 20:40:59 +0000 (06:40 +1000)
committerMario <mario@smbclan.net>
Sat, 24 Dec 2016 20:40:59 +0000 (06:40 +1000)

Trivial merge