mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-26 09:35:28 +00:00
4f18452ef6
Conflicts: apps/launcher/CMakeLists.txt apps/launcher/datafilesdialog.cpp apps/launcher/datafilesdialog.h apps/launcher/lineedit.hpp apps/launcher/maindialog.cpp apps/launcher/resources.qrc apps/launcher/resources/images/openmw-icon.png