From: terencehill <piuntn@gmail.com>
Date: Sat, 17 Jun 2017 18:18:53 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/vec2_optimizations
X-Git-Tag: xonotic-v0.8.5~2699^2~1
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=7524c05918362f3348973a04533523e4df15d358

Merge branch 'master' into terencehill/vec2_optimizations
---

7524c05918362f3348973a04533523e4df15d358