AnyOldName3 a179e9c001 The rest of the merge conflict ...

I didn't notice it as GitLab didn't highlight the diff properly.

2024-04-08 13:43:42 +01:00

..

components_de.ts

I guess these aren't wired up as a dependency of the build

2024-03-06 00:47:31 +00:00

components_fr.ts

I guess these aren't wired up as a dependency of the build

2024-03-06 00:47:31 +00:00

components_ru.ts

Resolve merge conflicts

2024-04-07 21:59:54 +01:00

launcher_de.ts

I guess these aren't wired up as a dependency of the build

2024-03-06 00:47:31 +00:00

launcher_fr.ts

I guess these aren't wired up as a dependency of the build

2024-03-06 00:47:31 +00:00

launcher_ru.ts

Resolve merge conflicts

2024-04-07 21:59:54 +01:00

wizard_de.ts

Resolve merge conflicts from https://gitlab.com/OpenMW/openmw/-/merge_requests/3893

2024-04-08 13:37:36 +01:00

wizard_fr.ts

Resolve merge conflicts from https://gitlab.com/OpenMW/openmw/-/merge_requests/3893

2024-04-08 13:37:36 +01:00

wizard_ru.ts

The rest of the merge conflict

2024-04-08 13:43:42 +01:00