l10n daemon script
|
2f63d3aaa1
|
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"
|
2020-03-23 06:03:45 +01:00 |
|
l10n daemon script
|
d1fdb28198
|
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"
|
2020-03-21 05:57:10 +01:00 |
|
l10n daemon script
|
d806a097e0
|
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"
|
2020-03-02 05:54:40 +01:00 |
|
l10n daemon script
|
b5783fedf5
|
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"
|
2020-02-19 05:56:56 +01:00 |
|
l10n daemon script
|
fb6681d5a5
|
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"
|
2020-02-17 05:51:58 +01:00 |
|
l10n daemon script
|
904370ea7b
|
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"
|
2020-02-16 05:57:19 +01:00 |
|
l10n daemon script
|
426b33533a
|
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"
|
2020-02-13 05:56:01 +01:00 |
|
Heiko Becker
|
d2f196e0c3
|
Replace plasma.kde.org with kde.org/plasma-desktop
krunner is master only, so it wasn't part of the previous commit
merged from Plasma/5.18.
|
2020-02-10 23:19:18 +01:00 |
|
l10n daemon script
|
8722372e0f
|
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"
|
2020-02-10 05:42:27 +01:00 |
|
l10n daemon script
|
88f838d147
|
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"
|
2020-02-09 05:53:42 +01:00 |
|
l10n daemon script
|
5d486eca53
|
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"
|
2020-02-07 05:56:06 +01:00 |
|
Marco Martin
|
bcb3a7ea3b
|
new applet to access KRunner functions
|
2020-02-05 19:57:44 +01:00 |
|