From: Martin Taibr <taibr.martin@gmail.com>
Date: Sat, 20 Oct 2018 14:29:33 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/effects
X-Git-Tag: xonotic-v0.8.5~1756^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=16e64ff58cf65d7b3e0815aadb530580a6aa251b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into martin-t/effects
---

16e64ff58cf65d7b3e0815aadb530580a6aa251b