l10n daemon script
|
92cb1290dc
|
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"
|
2021-09-26 02:14:27 +00:00 |
|
l10n daemon script
|
cca4b38058
|
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"
|
2021-09-25 02:15:02 +00:00 |
|
l10n daemon script
|
27811498d4
|
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"
|
2021-09-23 02:14:26 +00:00 |
|
l10n daemon script
|
348fe88428
|
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"
|
2021-09-20 02:30:30 +00:00 |
|
l10n daemon script
|
07dfe5d6d5
|
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"
|
2021-09-19 02:36:16 +00:00 |
|
l10n daemon script
|
50a50dd28d
|
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"
|
2021-09-18 02:13:25 +00:00 |
|
Bhushan Shah
|
47a4f6d632
|
Add airplane mode in quicksettings
Based on original patch from Nicolas Fella
(cherry picked from commit ed9517161d)
|
2021-09-16 09:19:47 +00:00 |
|