]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0995395 05e3807)
Merge master again... Mario/infection_merge
authorMario <mario@smbclan.net>
Wed, 24 May 2017 03:16:53 +0000 (13:16 +1000)
committerMario <mario@smbclan.net>
Wed, 24 May 2017 03:16:53 +0000 (13:16 +1000)

Trivial merge