Merge remote branch 'origin/fruitiex/lightshaders'
authorRudolf Polzer <divVerent@alientrap.org>
Tue, 24 Aug 2010 09:39:27 +0000 (11:39 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Tue, 24 Aug 2010 09:39:27 +0000 (11:39 +0200)
commit0e4e79330c9b8ac69d115b682b9b78c5c713cfad
treee00d8abc835eed2dfbaa0b4b347a66519671cb6a
parentdfbb931b9b75edc1fdc31c312e3de2a7e7502ad0
parentabda1f2b3e1ea25e9f241892abd5eac7f8896fc2
Merge remote branch 'origin/fruitiex/lightshaders'