From: Martin Taibr <taibr.martin@gmail.com>
Date: Sun, 27 Aug 2017 16:57:50 +0000 (+0200)
Subject: Merge branch 'martin-t/okc' into martin-t/okc2
X-Git-Tag: xonotic-v0.8.5~2430^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b2d3d16a9a3e5df1c518ecd2fce0bfa741db190a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/okc' into martin-t/okc2
---

b2d3d16a9a3e5df1c518ecd2fce0bfa741db190a