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

..

settings

fixed merge conflicts

2013-11-02 09:31:23 -05:00

utils

Implemented Launcher namespace

2013-10-25 11:17:26 -05:00

CMakeLists.txt

Reimplemented constentselector view class

2013-10-22 21:52:35 -05:00

datafilespage.cpp

Issue #913: Merge --master and --plugin switches

2013-10-27 20:03:12 +01:00

datafilespage.hpp

Implemented Launcher namespace

2013-10-25 11:17:26 -05:00

graphicspage.cpp

Implemented Launcher namespace

2013-10-25 11:17:26 -05:00

graphicspage.hpp

Implemented Launcher namespace

2013-10-25 11:17:26 -05:00

main.cpp

Implemented Launcher namespace

2013-10-25 11:17:26 -05:00

maindialog.cpp

fixed merge conflicts

2013-11-02 09:31:23 -05:00

maindialog.hpp

Implemented Launcher namespace

2013-10-25 11:17:26 -05:00

playpage.cpp

Implemented Launcher namespace

2013-10-25 11:17:26 -05:00

playpage.hpp

Implemented Launcher namespace

2013-10-25 11:17:26 -05:00

textslotmsgbox.cpp

Implemented Launcher namespace

2013-10-25 11:17:26 -05:00

textslotmsgbox.hpp

Implemented Launcher namespace

2013-10-25 11:17:26 -05:00

unshieldthread.cpp

Implemented Launcher namespace

2013-10-25 11:17:26 -05:00

unshieldthread.hpp

Implemented Launcher namespace

2013-10-25 11:17:26 -05:00