1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-29 13:20:35 +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-05-04 19:11:32 +02:00
2012-03-23 10:25:55 +01:00
2012-04-16 00:16:35 +02:00