scrawl 0f6fd80294 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics ... Conflicts: apps/openmw/mwgui/windowmanagerimp.cpp apps/openmw/mwrender/npcanimation.cpp files/mygui/openmw_settings_window.layout		2013-03-03 11:02:38 +01:00
..
openengine	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-03-03 11:02:38 +01:00
platform