l10n daemon script
|
f0e1d4e46e
|
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"
|
2022-04-16 01:47:42 +00:00 |
|
l10n daemon script
|
2d6d0c6789
|
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"
|
2022-04-09 01:50:14 +00:00 |
|
l10n daemon script
|
37b0e709e8
|
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"
|
2022-04-07 01:44:56 +00:00 |
|
l10n daemon script
|
03f3411c9a
|
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"
|
2022-04-05 01:49:56 +00:00 |
|
l10n daemon script
|
a385bae963
|
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"
|
2022-04-03 01:57:17 +00:00 |
|
l10n daemon script
|
7e53aab276
|
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"
|
2022-04-01 02:02:05 +00:00 |
|
l10n daemon script
|
7ff5f2b0a9
|
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"
|
2022-03-28 01:44:53 +00:00 |
|
l10n daemon script
|
5f20862a3f
|
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"
|
2022-03-27 01:51:39 +00:00 |
|
l10n daemon script
|
98306a6c6e
|
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"
|
2022-03-25 01:47:35 +00:00 |
|
l10n daemon script
|
0ce673f7b1
|
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"
|
2022-03-20 02:12:05 +00:00 |
|
l10n daemon script
|
c2474b385e
|
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"
|
2022-03-19 01:43:02 +00:00 |
|
Devin Lin
|
31ae31737c
|
quicksettings: Ensure package ids don't conflict with existing applets
|
2022-03-17 15:57:40 -04:00 |
|
Devin Lin
|
500132e56b
|
quicksettings/flashlight: Move C++ out of ShellUtil into package
|
2022-03-17 00:07:29 -04:00 |
|