1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-23 06:41:08 +00:00
AnyOldName3 f8224b29d4 Resolve merge conflicts
These were caused by https://gitlab.com/OpenMW/openmw/-/merge_requests/4005

I've had to cherry-pick parts of that MR into this commit, otherwise the CI would yell at me when it noticed the location tags had gone.
2024-04-07 21:59:54 +01:00
..
2022-07-31 19:59:24 +02:00
2020-06-15 16:37:47 +01:00
2024-01-02 09:23:55 +04:00
2023-02-25 17:38:08 +01:00
2023-12-29 18:56:59 +00:00
2023-12-20 22:44:20 +01:00