mirror of
https://github.com/OpenMW/openmw.git
synced 2025-06-29 01:41:38 +00:00
Merge branch 'master' of https://github.com/graffy76/openmw
fixed conflict Conflicts: apps/opencs/model/settings/usersettings.cpp
This commit is contained in:
commit
306c9e840c