Commit graph

2 commits

Author SHA1 Message Date
scrawl
ab9aa1ba74 Merge branch 'next' into minimap
Conflicts:
	files/mygui/openmw_map_window_layout.xml
2012-03-22 19:36:37 +01:00
scrawl
250fcab7c2 moved the mygui resources to a more suitable location 2012-03-22 17:11:24 +01:00
Renamed from extern/mygui_3.0.1/openmw_resources/openmw_map_window_layout.xml (Browse further)