Merge remote branch 'origin/mirceakitsune/red_planet'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 1 Nov 2010 21:01:06 +0000 (22:01 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 1 Nov 2010 21:01:06 +0000 (22:01 +0100)
Conflicts:
scripts/shaderlist.txt


Trivial merge