l10n daemon script
|
691723e4f6
|
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"
|
2017-09-03 04:44:27 +02:00 |
|
l10n daemon script
|
3dc4685561
|
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"
|
2017-09-01 04:37:46 +02:00 |
|
l10n daemon script
|
765d27cde5
|
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"
|
2017-08-30 08:02:14 +02:00 |
|
l10n daemon script
|
b6dabb55aa
|
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"
|
2017-08-27 04:43:13 +02:00 |
|
l10n daemon script
|
d718a61042
|
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"
|
2017-08-26 04:46:29 +02:00 |
|
David Rosca
|
d00e769749
|
Initial rename to Falkon
|
2017-08-25 17:32:32 +02:00 |
|