l10n daemon script
|
c9ff39a26f
|
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-07-26 02:17:02 +00:00 |
|
l10n daemon script
|
a9bab2af9d
|
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-23 03:30:47 +00: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
|
f00a1baae9
|
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-13 02:33:38 +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
|
bea89f08c1
|
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-04 02:38:04 +00:00 |
|
l10n daemon script
|
4b911fa0bc
|
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-03 02:25:31 +00:00 |
|
Devin Lin
|
ddbd2f031f
|
kwin/mobiletaskswitcher: Update effect format to match upstream
|
2023-03-30 22:04:15 -07:00 |
|