mirror of
https://github.com/OpenMW/openmw.git
synced 2025-12-16 00:13:07 +00:00
Conflicts: apps/launcher/CMakeLists.txt apps/launcher/datafilespage.cpp apps/launcher/datafilespage.hpp apps/launcher/graphicspage.cpp components/fileorderlist/utils/filedialog.cpp components/fileorderlist/utils/filedialog.hpp |
||
|---|---|---|
| .. | ||
| gamesettings.cpp | ||
| gamesettings.hpp | ||
| graphicssettings.cpp | ||
| graphicssettings.hpp | ||
| launchersettings.cpp | ||
| launchersettings.hpp | ||
| settingsbase.hpp | ||