From: Mario <zacjardine@y7mail.com>
Date: Mon, 19 Aug 2019 10:15:37 +0000 (+0000)
Subject: Merge branch 'Mario/no_dedicated_win_icon' into 'master'
X-Git-Tag: xonotic-v0.8.5~130
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=12c178c621a0de979c7fbce77f5cf664450e5420;p=xonotic%2Fxonotic.git

Merge branch 'Mario/no_dedicated_win_icon' into 'master'

Merge branch Mario/no_dedicated_win_icon (XXS merge request)

Closes #216

See merge request xonotic/xonotic!56
---

12c178c621a0de979c7fbce77f5cf664450e5420