forked from teamnwah/openmw-tes3coop
9ce4a04a2d
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 |
||
---|---|---|
.. | ||
settings | ||
utils | ||
CMakeLists.txt | ||
datafilespage.cpp | ||
datafilespage.hpp | ||
graphicspage.cpp | ||
graphicspage.hpp | ||
main.cpp | ||
maindialog.cpp | ||
maindialog.hpp | ||
playpage.cpp | ||
playpage.hpp | ||
textslotmsgbox.cpp | ||
textslotmsgbox.hpp | ||
unshieldthread.cpp | ||
unshieldthread.hpp |