- 25 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"
-
- 20 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"
-
- 16 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
-
- 04 Jun, 2022 1 commit
-
-
Heiko Becker authored
(cherry picked from commit e5707500)
-
- 28 May, 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
-
- 22 May, 2022 1 commit
-
-
Albert Astals Cid authored
-
- 15 May, 2022 5 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
- 07 May, 2022 1 commit
-
-
Heiko Becker authored
(cherry picked from commit 16402b4c)
-
- 30 Apr, 2022 2 commits
-
-
Nicolas Fella authored
-
Nicolas Fella authored
-
- 29 Apr, 2022 1 commit
-
-
Nicolas Fella authored
-
- 16 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 d6cae761)
-
- 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 3 commits
-
-
Nate Graham authored
-
Nate Graham authored
-
Nate Graham authored
Later we can port this to use PlasmaExtras.SearchField, but we can't do it yet because it's too new.
-
- 29 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"
-
- 23 Mar, 2022 1 commit
-
-
Script Kiddy authored
-
- 21 Mar, 2022 2 commits
-
-
Kai Uwe Broulik authored
Re-instate it on master branch. This reverts commit 1abb32b7.
-
Kai Uwe Broulik authored
-
- 20 Mar, 2022 5 commits
-
-
Kai Uwe Broulik authored
It requires Plasma Framework 5.93 which is higher than the dependency allowed by 22.04 release. This reverts commit 68331057. BUG: 451713
-
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
-
- 12 Mar, 2022 2 commits
-
-
Albert Astals Cid authored
-
Albert Astals Cid authored
-
- 11 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"
-
- 08 Mar, 2022 1 commit
-
-
Volker Krause authored
Breaks the build everywhere.
-
- 07 Mar, 2022 1 commit
-
-
Nate Graham authored
This lets us get rid of a PC2 import. It requires Frameworks 5.93, which is where the PlasmaExtras version was added.
-
- 27 Feb, 2022 1 commit
-
-
Heiko Becker authored
(cherry picked from commit 5717a4b5)
-