]> 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: c11ec19 55e756c)
Merge branch 'master' into DefaultUser/waypoint_icons
authorMario <mario@smbclan.net>
Wed, 7 Feb 2018 09:18:46 +0000 (19:18 +1000)
committerMario <mario@smbclan.net>
Wed, 7 Feb 2018 09:18:46 +0000 (19:18 +1000)

Trivial merge