]> 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: a04a0bc e4b829b)
Merge branch 'master' into Mario/event_heal
authorMario <mario@smbclan.net>
Sun, 17 Jun 2018 22:29:23 +0000 (08:29 +1000)
committerMario <mario@smbclan.net>
Sun, 17 Jun 2018 22:29:23 +0000 (08:29 +1000)

Trivial merge