]> 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: 13526b6 ba630ee)
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Sat, 27 Jan 2018 15:31:41 +0000 (01:31 +1000)
committerMario <mario@smbclan.net>
Sat, 27 Jan 2018 15:31:41 +0000 (01:31 +1000)

Trivial merge