]> 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: 4accd4c 8c094d9)
Merge branch 'Mario/dmg_wepent'
authorMario <mario@smbclan.net>
Fri, 16 Feb 2018 12:24:44 +0000 (22:24 +1000)
committerMario <mario@smbclan.net>
Fri, 16 Feb 2018 12:24:44 +0000 (22:24 +1000)

Trivial merge