mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-08-03 15:27:13 -04:00

Conflicts: apps/openmw/mwworld/weather.cpp components/fileorderlist/model/datafilesmodel.cpp
Conflicts: apps/openmw/mwworld/weather.cpp components/fileorderlist/model/datafilesmodel.cpp