Merge branch 'master' into m0rfar/heaven
authorRudolf Polzer <divverent@alientrap.org>
Wed, 4 Aug 2010 13:04:56 +0000 (15:04 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 4 Aug 2010 13:04:56 +0000 (15:04 +0200)
commit7f534f2acf3ba5e8b6b22ae01d395766dfebdb8b
treeac3bbf8158e5406e5fc876080d61c27b2ca04b74
parent91c3349a0129ff7de01315fadf8e7a694106f1d9
parent001bb3a2bcd29494ea5ca4833147c5abdfa7ef5d
Merge branch 'master' into m0rfar/heaven

Conflicts:
scripts/exosystem.shader
scripts/skies_heaven.shader
textures/skies/heaven.png