- 14 Jun, 2022 1 commit
-
-
Script Kiddy authored
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"
-
- 13 Jun, 2022 2 commits
-
-
Script Kiddy authored
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"
-
Script Kiddy authored
-
- 09 Jun, 2022 1 commit
-
-
Script Kiddy authored
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"
-
- 07 Jun, 2022 2 commits
-
-
Script Kiddy authored
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"
-
Script Kiddy authored
-
- 04 Jun, 2022 1 commit
-
-
Heiko Becker authored
(cherry picked from commit 0431a3a3)
-
- 28 May, 2022 1 commit
-
-
Script Kiddy authored
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"
-
- 15 May, 2022 1 commit
-
-
Script Kiddy authored
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"
-
- 07 May, 2022 1 commit
-
-
Heiko Becker authored
(cherry picked from commit 548114e4)
-
- 19 Apr, 2022 1 commit
-
-
Script Kiddy authored
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"
-
- 12 Apr, 2022 1 commit
-
-
Heiko Becker authored
(cherry picked from commit 3b9f1ba4)
-
- 08 Apr, 2022 2 commits
-
-
Script Kiddy authored
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"
-
Script Kiddy authored
-
- 30 Mar, 2022 1 commit
-
-
Script Kiddy authored
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"
-
- 29 Mar, 2022 1 commit
-
-
Script Kiddy authored
-
- 20 Mar, 2022 1 commit
-
-
Script Kiddy authored
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"
-
- 12 Mar, 2022 1 commit
-
-
Albert Astals Cid authored
-
- 04 Mar, 2022 2 commits
-
-
Script Kiddy authored
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"
-
Script Kiddy authored
-
- 27 Feb, 2022 1 commit
-
-
Heiko Becker authored
(cherry picked from commit b28674ff)
-
- 30 Jan, 2022 3 commits
-
-
Friedrich W. H. Kossebau authored
-
Friedrich W. H. Kossebau authored
GIT_SILENT
-
(cherry picked from commit 81052cd1) GIT_SILENT
-
- 28 Jan, 2022 3 commits
-
-
Heiko Becker authored
(cherry picked from commit 597f3079)
-
Heiko Becker authored
-
Heiko Becker authored
-
- 03 Jan, 2022 3 commits
-
-
Heiko Becker authored
(cherry picked from commit f56c734c)
-
Heiko Becker authored
-
Heiko Becker authored
-
- 09 Dec, 2021 2 commits
-
-
Albert Astals Cid authored
(cherry picked from commit ad210623)
-
Albert Astals Cid authored
-
- 02 Dec, 2021 1 commit
-
-
Albert Astals Cid authored
-
- 29 Nov, 2021 1 commit
-
-
Albert Astals Cid authored
-
- 22 Nov, 2021 1 commit
-
-
Heiko Becker authored
-
- 08 Nov, 2021 3 commits
-
-
Heiko Becker authored
-
Heiko Becker authored
-
Friedrich W. H. Kossebau authored
GIT_SILENT
-
- 29 Oct, 2021 1 commit
-
-
Friedrich W. H. Kossebau authored
Also add/move license files as required by REUSE specification GIT_SILENT
-
- 28 Oct, 2021 1 commit
-
-
Jonathan L. Verner authored
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
-