Merge branch 'master' into cbrutail/map-lightspeed
authorcbrutail <ruszkai.akos@gmail.com>
Mon, 3 Oct 2011 22:15:17 +0000 (00:15 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Mon, 3 Oct 2011 22:15:17 +0000 (00:15 +0200)
commit5625abded13bf4902f027931d831bfc79a9d372b
tree0b6149d595cc4a2ab69a343d5191559cab09f49b
parentf6d605645f0f6b9240193244d35cf8419dca7543
parentbf8e5fd2afac1f81c047543f53acbedca3be6d27
Merge branch 'master' into cbrutail/map-lightspeed

Conflicts:
scripts/liquids_water.shader

I hope I don't fuck up my branch
scripts/liquids_water.shader