1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-10 03:39:55 +00:00
scrawl a1b86acc38 Merge branch 'master' into inventoryGUI
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
	files/mygui/core.xml
2012-05-11 16:41:27 +02:00
..
2012-04-11 18:53:13 +02:00
2012-04-11 18:53:13 +02:00
2012-04-11 18:53:13 +02:00
2012-04-16 20:39:41 +02:00