mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-16 00:19:56 +00:00
ee27e3bb58
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 |