mirror of
https://github.com/OpenMW/openmw.git
synced 2025-02-03 04:45:33 +00:00
97cc2522c0
Conflicts: apps/openmw/mwgui/settingswindow.cpp extern/oics/ICSInputControlSystem_joystick.cpp files/mygui/openmw_settings_window.layout |
||
---|---|---|
.. | ||
ogre-ffmpeg-videoplayer | ||
oics | ||
sdl4ogre | ||
shiny |