From: Mario <zacjardine@y7mail.com>
Date: Mon, 22 Oct 2018 18:49:02 +0000 (+0000)
Subject: Merge branch 'desktop-fix' into 'master'
X-Git-Tag: xonotic-v0.8.5~143
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=f7994e0f09fd2a71efcc517dc28e0cb14ba40878

Merge branch 'desktop-fix' into 'master'

Update desktop/AppData files

See merge request xonotic/xonotic!47
---

f7994e0f09fd2a71efcc517dc28e0cb14ba40878