From: Mario <mario@smbclan.net>
Date: Sat, 13 May 2017 03:41:42 +0000 (+1000)
Subject: Merge branch 'master' into Mario/cts_checkpoint_speedup
X-Git-Tag: xonotic-v0.8.5~2781^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=445b26b36e0fb62ce64c6166b3506cc182648059;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/cts_checkpoint_speedup
---

445b26b36e0fb62ce64c6166b3506cc182648059