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)
commitf879e0523ca5a81650ea0edee80ad5a8410e25ae
treee3e5e55c68f46749d3b607f1419f3dd0994f78bf
parent23020fa070eb5ba87109dc54573a121073bb778f
parent8e9fd7bd22f6c4efadb84ce788f820eed6a3abdd
Merge remote branch 'origin/tzork/facility114x'

Conflicts:
scripts/shaderlist.txt
scripts/shaderlist.txt