mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-11 00:39:59 +00:00
97cc2522c0
Conflicts: apps/openmw/mwgui/settingswindow.cpp extern/oics/ICSInputControlSystem_joystick.cpp files/mygui/openmw_settings_window.layout |
||
---|---|---|
.. | ||
bsatool | ||
esmtool | ||
essimporter | ||
launcher | ||
mwiniimporter | ||
opencs | ||
openmw | ||
openmw_test_suite | ||
wizard | ||
doc.hpp |