mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-02-19 03:39:58 +00:00
Conflicts: apps/openmw/mwgui/settingswindow.cpp extern/oics/ICSInputControlSystem_joystick.cpp files/mygui/openmw_settings_window.layout
Conflicts: apps/openmw/mwgui/settingswindow.cpp extern/oics/ICSInputControlSystem_joystick.cpp files/mygui/openmw_settings_window.layout