graffy76 8d12e2b99d fixed merge conflicts ... Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector Conflicts: apps/launcher/datafilespage.cpp apps/launcher/settings/gamesettings.hpp components/contentselector/model/contentmodel.cpp		2013-11-02 09:31:23 -05:00
..
bsatool	Bsatool: extract and extractall modes	2013-03-07 21:21:00 +01:00
esmtool	Renamed esxSelector to contentSelector	2013-09-21 23:06:29 -05:00
launcher	fixed merge conflicts	2013-11-02 09:31:23 -05:00
mwiniimporter	Issue #913: Merge --master and --plugin switches	2013-09-29 09:11:57 +02:00
opencs	Another stab at fixing the pathing problem...	2013-11-01 21:47:26 -05:00
openmw	Merge branch 'dialogue' into saving	2013-10-21 16:45:43 +02:00
openmw_test_suite	Added unittests for FileFinder::FileFinderStrict class.	2013-08-31 00:13:42 +02:00
doc.hpp