Commit Graph

12 Commits

Author SHA1 Message Date
Tobias Fella bec24f9436
Add command line parameters 2020-05-11 21:13:27 +02:00
l10n daemon script 229cd787ec 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-05-09 06:53:24 +02:00
l10n daemon script 273d652aaa 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-05-08 06:22:34 +02:00
l10n daemon script 4289170c0c 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-05-04 06:04:09 +02:00
l10n daemon script db8c6053b3 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-04-30 06:20:02 +02:00
l10n daemon script 9c506c5338 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-04-28 06:40:55 +02:00
l10n daemon script cfb18072fc 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-04-26 06:16:07 +02:00
l10n daemon script 3977aa7e41 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-04-25 06:22:35 +02:00
l10n daemon script 45074ca2e8 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-04-24 06:20:00 +02:00
l10n daemon script 772d284e83 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-04-23 06:34:57 +02:00
Tobias Fella 4acd43d240 Update icon name 2020-04-22 01:52:53 +02:00
Tobias Fella 399892d474
add files 2020-03-26 18:45:16 +01:00