From: Lyberta <lyberta@lyberta.net>
Date: Wed, 22 Aug 2018 10:37:22 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FLyberta%2Fmaster;p=xonotic%2Fxonotic-data.pk3dir.git

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

39433c4738131ac5f74ca190179668ebd59746ab