l10n daemon script
|
5131546336
|
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"
|
2020-06-17 14:13:18 +02:00 |
|
l10n daemon script
|
59f61325a7
|
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"
|
2020-06-05 05:05:54 +02:00 |
|
l10n daemon script
|
fcf8980577
|
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"
|
2020-01-21 06:17:31 +01:00 |
|
l10n daemon script
|
9b98493232
|
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"
|
2020-01-20 06:01:38 +01:00 |
|
l10n daemon script
|
6fd1d0184e
|
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-12-31 05:45:46 +01:00 |
|
l10n daemon script
|
ab190aa5da
|
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-12-28 05:25:20 +01:00 |
|
l10n daemon script
|
a7a5a3f003
|
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-12-04 05:36:25 +01:00 |
|
l10n daemon script
|
c6089a7b92
|
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-11-23 05:29:59 +01:00 |
|
l10n daemon script
|
78ce668071
|
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-11-20 05:40:05 +01:00 |
|
Aleix Pol
|
f0f01e82e6
|
Centralise startup code in this repository
Have it start through the session file that the display manager should
be starting.
|
2019-11-19 15:01:32 +01:00 |
|