l10n daemon script
|
dc1a874188
|
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"
|
2019-05-20 05:29:18 +02:00 |
|
l10n daemon script
|
85849808bf
|
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"
|
2019-05-16 05:54:42 +02:00 |
|
l10n daemon script
|
e671db140a
|
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"
|
2019-05-14 05:46:38 +02:00 |
|
l10n daemon script
|
60801fbbc8
|
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"
|
2019-05-09 06:04:53 +02:00 |
|
l10n daemon script
|
f44018095d
|
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"
|
2019-05-06 05:50:51 +02:00 |
|
l10n daemon script
|
d056b04483
|
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"
|
2019-05-05 05:57:15 +02:00 |
Jonathan Riddell
|
2a0d25f07d
|
add .desktop file used for kde.org/applications generator
|
2019-05-03 14:55:58 +01:00 |