]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 0360202 37e3d71)
Merge branch 'asciiwolf/xonotic-appdata'
authorMario <mario@smbclan.net>
Fri, 19 Oct 2018 21:12:24 +0000 (07:12 +1000)
committerMario <mario@smbclan.net>
Fri, 19 Oct 2018 21:12:24 +0000 (07:12 +1000)

Trivial merge