l10n daemon script
|
2528ed2163
|
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"
|
2019-01-06 05:29:16 +01:00 |
|
l10n daemon script
|
d9a926a620
|
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"
|
2018-11-23 05:34:04 +01:00 |
|
l10n daemon script
|
9e56be5194
|
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"
|
2018-11-17 05:55:31 +01:00 |
|
l10n daemon script
|
6df8ac4c7d
|
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"
|
2018-10-28 04:53:16 +01:00 |
|
l10n daemon script
|
14f88fb46c
|
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"
|
2018-10-23 06:01:07 +02:00 |
|
l10n daemon script
|
116ba93b79
|
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"
|
2018-10-22 05:54:15 +02:00 |
|
l10n daemon script
|
42e0c865b2
|
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"
|
2018-10-17 06:32:51 +02:00 |
|
l10n daemon script
|
c6109d11ad
|
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"
|
2018-10-06 05:44:51 +02:00 |
|
l10n daemon script
|
cda74effe3
|
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"
|
2018-10-05 05:52:10 +02:00 |
|
l10n daemon script
|
32948ddd02
|
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"
|
2018-10-04 05:51:46 +02:00 |
|
l10n daemon script
|
ce21076452
|
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"
|
2018-10-03 06:07:51 +02:00 |
|
Anmol Gautam
|
0abde8b755
|
Added HelloQml Extension
Reviewers: drosca
Reviewed By: drosca
Subscribers: falkon
Tags: #falkon
Differential Revision: https://phabricator.kde.org/D14519
|
2018-10-02 03:07:32 +05:30 |
|