l10n daemon script
|
bba40b9b9d
|
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"
|
2017-02-05 06:07:10 +01:00 |
|
l10n daemon script
|
7d3d68a3c8
|
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"
|
2017-01-16 06:06:25 +01:00 |
|
l10n daemon script
|
2f4e59e902
|
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"
|
2016-12-22 05:52:51 +01:00 |
|
l10n daemon script
|
793441b77b
|
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"
|
2016-12-20 12:53:44 +01:00 |
|
l10n daemon script
|
7c13492f2a
|
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"
|
2016-11-29 04:25:11 +01:00 |
|
l10n daemon script
|
71b8f9b22d
|
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"
|
2016-09-09 09:25:38 +00:00 |
|
l10n daemon script
|
4db599dcf8
|
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"
|
2016-08-06 09:58:49 +00:00 |
|
Friedrich W. H. Kossebau
|
d4f10cd67e
|
Add a kapptemplate for Plasma Wallpaper
REVIEW: 128594
|
2016-08-05 16:02:14 +02:00 |
|