mirror of
https://github.com/OpenMW/openmw.git
synced 2025-03-06 03:49:52 +00:00
Conflicts: apps/openmw/mwgui/settingswindow.cpp extern/oics/ICSInputControlSystem_joystick.cpp files/mygui/openmw_settings_window.layout |
||
---|---|---|
.. | ||
ogre-ffmpeg-videoplayer | ||
oics | ||
sdl4ogre | ||
shiny |