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
..
bsatool
esmtool	Merge branch 'master' into dialogue	2013-11-10 13:21:39 +01:00
launcher	Merge branch 'openmw-27'	2013-11-06 10:21:25 +01:00
mwiniimporter
opencs	hid ID column in info tables (not relevant for the user)	2013-11-14 13:14:37 +01:00
openmw	Merge branch 'master' of https://github.com/zinnschlag/openmw into magic	2013-11-14 14:25:22 +01:00
openmw_test_suite
doc.hpp