1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-25 12:41:01 +00:00
scrawl 956d8adb99 Merge branch 'master' of https://github.com/zinnschlag/openmw into magic
Conflicts:
	apps/openmw/mwgui/inventoryitemmodel.cpp
2013-11-14 14:25:22 +01:00
..
2013-11-06 10:21:25 +01:00