Commit Graph

14 Commits

Author SHA1 Message Date
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
6decf96497 GIT_SILENT made messages (after extraction) 2020-10-30 02:31:29 +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
9afc090c9c GIT_SILENT made messages (after extraction) 2020-10-29 02:32:25 +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
73796734e5 GIT_SILENT made messages (after extraction) 2020-10-28 02:27:51 +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
1876d9148b GIT_SILENT made messages (after extraction) 2020-10-27 02:27:03 +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
6a2c11b56c GIT_SILENT made messages (after extraction) 2020-10-26 02:24:08 +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
ab548008ed Change website URL. 2020-01-09 04:36:52 +00:00
Black Hat
ecbf5e83b4 Change metadata license to CC0-1.0 2019-11-30 23:10:26 +00:00
Black Hat
2defc5a134 Revert "Embed cmark."
This reverts commit f35001112dc740ed827e4a4de6e4bb3d94b0e466
2019-07-20 11:13:09 +00:00