Commit Graph

10 Commits

Author SHA1 Message Date
l10n daemon script
d9218b203d 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-17 06:15:36 +01:00
l10n daemon script
4240d55669 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-13 06:21:10 +01:00
l10n daemon script
04020e7021 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-12 06:24:28 +01:00
l10n daemon script
91f82fb42c 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-07 06:24:31 +01:00
l10n daemon script
ed3919cb83 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-06 06:20:30 +01:00
l10n daemon script
bd0a01b235 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-05 06:31:55 +01:00
l10n daemon script
36a92be7bd 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-04 06:30:04 +01:00
Tobias Fella
c44e4544ca Add temporary icon 2020-11-03 16:57:28 +01:00
l10n daemon script
e4338a599e 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-03 06:12:27 +01:00
Tobias Fella
fbc28148a0 Cleanup cmake, metadata 2020-11-02 16:12:33 +00:00