From: Lyberta <lyberta@lyberta.net>
Date: Thu, 19 Apr 2018 15:39:06 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/d0BuildFix
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=379298bad3af64b7b26de76b2a41121f1e5e1131;hp=379298bad3af64b7b26de76b2a41121f1e5e1131;p=xonotic%2Fxonotic.git

Merge branch 'master' into Lyberta/d0BuildFix
---