From: Rudolf Polzer <divVerent@alientrap.org>
Date: Thu, 6 May 2010 14:55:25 +0000 (+0200)
Subject: Merge remote branch 'origin/tzork/facility114x'
X-Git-Tag: xonotic-v0.1.0preview~175^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f879e0523ca5a81650ea0edee80ad5a8410e25ae;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/tzork/facility114x'

Conflicts:
	scripts/shaderlist.txt
---

f879e0523ca5a81650ea0edee80ad5a8410e25ae
diff --cc scripts/shaderlist.txt
index 20aec31d,b3ceaa31..73b57b56
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -1,5 -1,5 +1,6 @@@
- common
- exosystem
- exx
- trak5x
- trak4x
++common
+ exosystem
+ exx
+ trak5x
+ trak4x
 -facility114x
++facility114x