From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 9 Aug 2010 05:00:38 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/tzork/terrain01x'
X-Git-Tag: xonotic-v0.1.0preview~141^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=937e74a83a61c471a43a72c0a3efe48e943091fd;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'refs/remotes/origin/tzork/terrain01x'

Conflicts:
	scripts/shaderlist.txt
---

937e74a83a61c471a43a72c0a3efe48e943091fd