scrawl d4264353a3 Merge branch 'z-up' into graphics ...

Conflicts:
	apps/openmw/mwrender/localmap.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/water.cpp
	files/materials/water.shader

2013-02-26 14:54:53 +01:00

..

openengine

Merge branch 'z-up' into graphics

2013-02-26 14:54:53 +01:00

platform

removed tabs

2012-03-02 14:18:10 +04:00