From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 16 Jan 2012 09:30:45 +0000 (+0100)
Subject: Merge branch 'master' into divVerent/euclidean_fail
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c0c4fa9e3edcafc93084d7254d5784adcbd6bbc9;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into divVerent/euclidean_fail

Conflicts:
	scripts/shaderlist.txt
---

c0c4fa9e3edcafc93084d7254d5784adcbd6bbc9