Merge remote branch 'origin/mookow/liquids'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 22:56:55 +0000 (00:56 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 22:56:55 +0000 (00:56 +0200)
commit24a94491bacea032fe544203db2d3a1bfb589bb9
tree9e6a82ec00ce4bfbcaadded3de75d85be17dd0cb
parentba22ca49999dddc6876073bc10bf252ab13ca4ad
parent873705d295f9c74912b56a85f524f10a1d81102e
Merge remote branch 'origin/mookow/liquids'

Conflicts:
scripts/liquids.shader
scripts/liquids_lava.shader