From: Mario <mario@smbclan.net>
Date: Fri, 19 Oct 2018 21:12:24 +0000 (+1000)
Subject: Merge branch 'asciiwolf/xonotic-appdata'
X-Git-Tag: xonotic-v0.8.5~144
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=db66da3c52598d1ba2555a64a7bb95b6daedff65;p=xonotic%2Fxonotic.git

Merge branch 'asciiwolf/xonotic-appdata'
---

db66da3c52598d1ba2555a64a7bb95b6daedff65