Devin Lin
|
14f3f07316
|
Convert more uses of QtGraphicalEffects to MultiEffect
|
2023-05-13 11:15:57 -04:00 |
|
l10n daemon script
|
9f6345c3f3
|
SVN_SILENT made messages (.desktop file) - always resolve ours
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"
|
2023-05-08 02:24:47 +00:00 |
|
Alexander Lohnau
|
194b26c8a2
|
Port to new org.kde.coreaddons QML module
org.kde.kcoreaddons is part of KDeclarative and will be removed in the future
|
2023-05-07 14:47:22 +02:00 |
|
l10n daemon script
|
42bf272681
|
SVN_SILENT made messages (.desktop file) - always resolve ours
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"
|
2023-04-19 02:38:31 +00:00 |
|
l10n daemon script
|
38e235b1b0
|
SVN_SILENT made messages (.desktop file) - always resolve ours
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"
|
2023-04-11 03:11:36 +00:00 |
|
l10n daemon script
|
c71737436e
|
SVN_SILENT made messages (.desktop file) - always resolve ours
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"
|
2023-04-05 02:36:13 +00:00 |
|
Devin Lin
|
fe7a453ddd
|
lookandfeel: Rename folder to be have a consistent name with other shells
|
2023-04-02 19:58:41 -07:00 |
|