- 13 Mar, 2021 3 commits
-
-
Albert Astals Cid authored
-
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
-
- 12 Mar, 2021 1 commit
-
-
Albert Astals Cid authored
-
- 24 Feb, 2021 3 commits
-
-
Heiko Becker authored
(cherry picked from commit f9a062ff)
-
Heiko Becker authored
-
Heiko Becker authored
-
- 08 Feb, 2021 2 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
- 29 Jan, 2021 3 commits
-
-
Heiko Becker authored
-
Heiko Becker authored
(cherry picked from commit 1a7f3a85)
-
Heiko Becker authored
-
- 24 Jan, 2021 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
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"
-
- 22 Jan, 2021 2 commits
-
-
Aleix Pol Gonzalez authored
-
Aleix Pol Gonzalez authored
It's not supported by QImage, so we need to do it ourselves by swapping the B and the R.
-
- 18 Jan, 2021 4 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
-
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
-
- 02 Jan, 2021 3 commits
-
-
Christoph Feck authored
-
Christoph Feck authored
(cherry picked from commit 706d4853)
-
Christoph Feck authored
-
- 18 Dec, 2020 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
-
- 07 Dec, 2020 4 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
-
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
-
- 02 Dec, 2020 3 commits
-
-
Christoph Feck authored
-
Christoph Feck authored
(cherry picked from commit b5a328b9)
-
Christoph Feck authored
-
- 25 Nov, 2020 1 commit
-
-
Christoph Feck authored
-
- 18 Nov, 2020 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
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 Nov, 2020 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
-
- 11 Nov, 2020 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"
-
- 08 Nov, 2020 2 commits
-
-
Albert Astals Cid authored
-
Albert Astals Cid authored
-