From: Rudolf Polzer <rpolzer@grawp.(none)>
Date: Fri, 2 Apr 2010 19:16:02 +0000 (+0200)
Subject: Merge branch 'm0rfar/wtf'
X-Git-Tag: xonotic-v0.1.0preview~178
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=d5ef7cdf0f297cb8ddfc995153b334e323b6c121;hp=-c

Merge branch 'm0rfar/wtf'

Conflicts:
	env/exosystem/exosystem2_bk.tga
	env/exosystem/exosystem2_dn.tga
	env/exosystem/exosystem2_ft.tga
	env/exosystem/exosystem2_lf.tga
	env/exosystem/exosystem2_preview.png
	env/exosystem/exosystem2_rt.tga
	env/exosystem/exosystem2_up.tga
	env/exosystem/exosystem_bk.tga
	env/exosystem/exosystem_dn.tga
	env/exosystem/exosystem_ft.tga
	env/exosystem/exosystem_lf.tga
	env/exosystem/exosystem_preview.png
	env/exosystem/exosystem_rt.tga
	env/exosystem/exosystem_up.tga
---

d5ef7cdf0f297cb8ddfc995153b334e323b6c121