l10n daemon script
|
0356908fc8
|
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-06 04:42:32 +02:00 |
|
l10n daemon script
|
473a6c14ac
|
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-07-30 04:49:43 +02:00 |
|
l10n daemon script
|
7ba311fc78
|
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-07-24 04:32:05 +02:00 |
|
l10n daemon script
|
d276a7eb37
|
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-07-23 04:32:09 +02:00 |
|
l10n daemon script
|
a4c0a8fb96
|
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-06-30 04:28:23 +02:00 |
|
l10n daemon script
|
bb3722b144
|
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-06-28 08:22:58 +02:00 |
|
l10n daemon script
|
fbd7e6d383
|
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-06-21 08:21:46 +02:00 |
|
l10n daemon script
|
36269e6506
|
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-06-20 04:26:54 +02:00 |
|
l10n daemon script
|
72162bf8c9
|
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-06-08 04:52:02 +02:00 |
|
l10n daemon script
|
6305de985b
|
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-06-06 04:28:16 +02:00 |
|
l10n daemon script
|
47b4aadaa3
|
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-06-05 04:09:27 +02:00 |
|
l10n daemon script
|
c070b4d445
|
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-06-04 04:17:49 +02:00 |
|
l10n daemon script
|
ece098ac3b
|
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-05-31 08:06:19 +02:00 |
|
l10n daemon script
|
0d217c58e1
|
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-05-27 04:22:53 +02:00 |
|
l10n daemon script
|
0711dac538
|
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-05-26 04:21:11 +02:00 |
|
Aleix Pol
|
139bac55bc
|
Fix desktop file
Have it open kdeconnect-indicator rather than plasmawindowed
|
2017-05-24 21:57:06 +02:00 |
|