]> 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: b1ac6c2 ea3f94a)
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Mon, 9 Jan 2017 10:12:38 +0000 (20:12 +1000)
committerMario <mario@smbclan.net>
Mon, 9 Jan 2017 10:12:38 +0000 (20:12 +1000)

Trivial merge