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
..
model	fixed merge conflicts	2013-11-02 09:31:23 -05:00
view	Another stab at fixing the pathing problem...	2013-11-01 21:47:26 -05:00