From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 1 Nov 2010 21:01:06 +0000 (+0100)
Subject: Merge remote branch 'origin/mirceakitsune/red_planet'
X-Git-Tag: xonotic-v0.1.0preview~58
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=04191fb30151e142649d4f5e99a10a7906915dd0;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/mirceakitsune/red_planet'

Conflicts:
	scripts/shaderlist.txt
---

04191fb30151e142649d4f5e99a10a7906915dd0