GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit 0431a3a3)

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit 548114e4)

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit 3b9f1ba4)

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit b28674ff)

GIT_SILENT

Albert Astals Cid authored Nov 29, 2021 and Friedrich W. H. Kossebau committed Jan 30, 2022

(cherry picked from commit 81052cd1)

GIT_SILENT

(cherry picked from commit 597f3079)

(cherry picked from commit f56c734c)

(cherry picked from commit ad210623)

GIT_SILENT

Also add/move license files as required by REUSE specification

GIT_SILENT

When the `codestyle.py` is too slow in outputting data, the
`processOutputStarted` function might miss them, release the
`m_mutex` lock and set `m_stylechecker` to nullptr.

When the data then later arrives, processOutputStarted is called
again, however without `m_mutex` being held and `m_stylechecker`
no longer valid. This eventually leads to a crash when dereferencing
`m_stylechecker`.

The current commit tries to fix this by checking that `m_mutex` is
held at the start of `processOutputStarted`. If it is not, then we are
in the "late data case". However, in this situation, we do not know
the amount of data that should still arrive and basically the only
way to solve the situation, is to kill the server (and start it again
on the next run). So that is what we do.

BUG: 444484