l10n daemon script
|
2fcc37dfb6
|
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:47:43 +01:00 |
|
l10n daemon script
|
b6a6efc579
|
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"
|
2015-12-30 09:24:52 +00:00 |
|
l10n daemon script
|
c0b4df13ae
|
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"
|
2015-06-09 14:09:02 +00:00 |
|
l10n daemon script
|
fd7a7bd947
|
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"
|
2015-06-07 04:13:54 +00:00 |
|
l10n daemon script
|
55c21cf142
|
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"
|
2015-06-06 04:26:29 +00:00 |
|
l10n daemon script
|
80dc2e97b8
|
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"
|
2015-06-05 04:19:09 +00:00 |
 Andrius Štikonas
|
1ef6fa8131
|
Move kpmcore library into its own repository.
|
2015-06-04 01:29:22 +01:00 |