1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 15:35:23 +00:00
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
..
2013-02-06 00:51:05 +01:00
2013-02-26 14:54:53 +01:00