From: Rudolf Polzer <divverent@xonotic.org>
Date: Thu, 17 Nov 2011 17:06:45 +0000 (+0100)
Subject: Merge branch 'master' into divVerent/csqcmodel
X-Git-Tag: xonotic-v0.6.0~74^2~100^2~47
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=95dd310175cb3f235a457ad28cd77c659eec71f4;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into divVerent/csqcmodel
---

95dd310175cb3f235a457ad28cd77c659eec71f4