graffy76 9ce4a04a2d merge from saving ... Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector Conflicts: apps/launcher/datafilespage.cpp apps/opencs/editor.cpp apps/opencs/view/doc/filedialog.cpp apps/opencs/view/doc/filedialog.hpp		2013-10-25 14:44:22 -05:00
..
bsatool
esmtool
launcher	merge from saving	2013-10-25 14:44:22 -05:00
mwiniimporter
opencs	merge from saving	2013-10-25 14:44:22 -05:00
openmw	Merge branch 'master' into esxSelector	2013-10-25 08:11:24 -05:00
openmw_test_suite
doc.hpp