l10n daemon script
|
da09ad4bf2
|
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-11-01 06:35:57 +01:00 |
|
l10n daemon script
|
efd22b1d21
|
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-10-30 06:37:41 +01:00 |
|
l10n daemon script
|
60c511b9d7
|
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-10-29 06:37:31 +01:00 |
|
l10n daemon script
|
032140331c
|
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-10-28 06:22:17 +01:00 |
|
l10n daemon script
|
3c5cd095b8
|
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-10-27 06:19:17 +01:00 |
|
l10n daemon script
|
b9bd2aabff
|
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-10-26 06:08:59 +01:00 |
|
l10n daemon script
|
a787d1a21d
|
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-10-25 05:12:30 +01:00 |
|
Black Hat
|
2defc5a134
|
Revert "Embed cmark."
This reverts commit f35001112dc740ed827e4a4de6e4bb3d94b0e466
|
2019-07-20 11:13:09 +00:00 |
|