From: Rudolf Polzer <divverent@gmail.com>
Date: Wed, 17 Oct 2018 16:14:19 +0000 (+0000)
Subject: Merge branch 'patch-1' into 'master'
X-Git-Tag: xonotic-v0.8.5~147
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cd7078f2f7bd23108f92aed9f750f2749f65fb56;p=xonotic%2Fxonotic.git

Merge branch 'patch-1' into 'master'

Update .desktop files to Freedesktop standards Issue #159

See merge request xonotic/xonotic!17
---

cd7078f2f7bd23108f92aed9f750f2749f65fb56