]> 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: 89c6c60 0e63ac3)
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Mon, 1 Jan 2018 06:50:05 +0000 (16:50 +1000)
committerMario <mario@smbclan.net>
Mon, 1 Jan 2018 06:50:05 +0000 (16:50 +1000)

Trivial merge