mirror of
https://github.com/OpenMW/openmw.git
synced 2025-12-02 06:34:34 +00:00
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 |
||
|---|---|---|
| .. | ||
| gamesettings.cpp | ||
| gamesettings.hpp | ||
| graphicssettings.cpp | ||
| graphicssettings.hpp | ||
| launchersettings.cpp | ||
| launchersettings.hpp | ||
| settingsbase.hpp | ||