From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 2 Oct 2010 19:50:29 +0000 (+0200)
Subject: Merge branch 'master' into fruitiex/runningmanctf
X-Git-Tag: xonotic-v0.5.0~129^2~56^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9081f455eb32dc109cdbbf70c8fcb59006ee1460;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into fruitiex/runningmanctf

Conflicts:
	scripts/proceduralx.shader
---

9081f455eb32dc109cdbbf70c8fcb59006ee1460