]> 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: 50d6cb6 0a4df55)
Merge remote-tracking branch 'origin/master'
authorMario <mario@smbclan.net>
Tue, 19 Jun 2018 01:34:38 +0000 (11:34 +1000)
committerMario <mario@smbclan.net>
Tue, 19 Jun 2018 01:34:38 +0000 (11:34 +1000)

Trivial merge