From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 14 May 2012 18:33:51 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/augenkrebs
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=92c50bd4e5cbf83970f9e73912cb15df8ad5e339;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into divVerent/augenkrebs

Conflicts:
	scripts/shaderlist.txt
---

92c50bd4e5cbf83970f9e73912cb15df8ad5e339