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)
commit04191fb30151e142649d4f5e99a10a7906915dd0
tree5ddb453a8dbf87be1ae2733a76d4b30fc5ee23c4
parent2a894757eae152b20734b24a2f9faed3fb656440
parent44c0b098eb83db760553ab7b790ecebd25e020c2
Merge remote branch 'origin/mirceakitsune/red_planet'

Conflicts:
scripts/shaderlist.txt