l10n daemon script
|
1bce6ee8fa
|
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-10-01 05:16:25 +02:00 |
|
l10n daemon script
|
812c61c5ff
|
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-09-27 09:12:08 +02:00 |
|
l10n daemon script
|
4c3d5bcb7f
|
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-09-26 05:00:45 +02:00 |
|
l10n daemon script
|
f086f31b5b
|
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-09-16 05:07:09 +02:00 |
|
Marco Martin
|
a9ab4a0c01
|
add a quick touch test panel
|
2017-09-14 10:23:49 +02:00 |
|