Merge remote branch 'origin/tzork/facility114x'
authorRudolf Polzer <divVerent@alientrap.org>
Thu, 6 May 2010 14:55:25 +0000 (16:55 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Thu, 6 May 2010 14:55:25 +0000 (16:55 +0200)
Conflicts:
scripts/shaderlist.txt

1  2 
scripts/shaderlist.txt

@@@ -1,5 -1,5 +1,6 @@@
- common\r
- exosystem\r
- exx\r
- trak5x\r
- trak4x
++common
+ exosystem
+ exx
+ trak5x
+ trak4x
 -facility114x
++facility114x