l10n daemon script
|
167fd6cf59
|
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"
|
2016-09-28 11:51:45 +00:00 |
|
l10n daemon script
|
e884c4a9ac
|
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"
|
2016-09-18 09:32:51 +00:00 |
|
l10n daemon script
|
2d56c59386
|
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"
|
2016-09-14 09:17:50 +00:00 |
|
Aleix Pol
|
e7578cc129
|
Refactor capabilities together with Albert
He is committing a similar patch to kdeconnect-android
|
2016-05-31 17:16:01 +02:00 |
|
l10n daemon script
|
a0c1a57999
|
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"
|
2015-12-30 09:23:05 +00:00 |
|
l10n daemon script
|
6434909e79
|
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"
|
2015-12-29 11:22:52 +00:00 |
|
l10n daemon script
|
fc2bd97e69
|
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"
|
2015-11-17 12:54:36 +00:00 |
|
l10n daemon script
|
0145c837db
|
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"
|
2015-11-11 10:30:30 +00:00 |
|
l10n daemon script
|
e424bcec1a
|
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"
|
2015-11-04 17:00:05 +00:00 |
|
l10n daemon script
|
47ee991548
|
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"
|
2015-10-01 10:36:43 +00:00 |
|
l10n daemon script
|
933cbd5bfd
|
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"
|
2015-09-13 10:31:01 +00:00 |
|
l10n daemon script
|
5795e27191
|
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"
|
2015-09-10 11:33:23 +00:00 |
|
l10n daemon script
|
e6a759a071
|
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"
|
2015-09-01 12:31:29 +00:00 |
|
l10n daemon script
|
43161b3932
|
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"
|
2015-08-01 10:37:53 +00:00 |
|
l10n daemon script
|
f86c5e4a4c
|
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"
|
2015-07-03 10:06:32 +00:00 |
|
l10n daemon script
|
7d514bdd29
|
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"
|
2015-06-30 13:47:48 +00:00 |
|
l10n daemon script
|
f075da1eab
|
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"
|
2015-06-29 10:29:47 +00:00 |
|
l10n daemon script
|
69d8a40aa6
|
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"
|
2015-06-24 10:38:32 +00:00 |
|
l10n daemon script
|
c1a9ffd305
|
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"
|
2015-06-21 10:17:25 +00:00 |
|
l10n daemon script
|
d8b3d829e4
|
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"
|
2015-06-20 11:56:14 +00:00 |
|
l10n daemon script
|
7fb21dec12
|
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"
|
2015-06-19 10:41:31 +00:00 |
|
l10n daemon script
|
700eff446e
|
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"
|
2015-06-18 11:49:24 +00:00 |
|
Aleix Pol
|
5c79e8a7a6
|
Implement an MPRIS client plugin
Makes it possible to control remote MPRIS instances.
REVIEW: 124100
|
2015-06-18 04:01:01 +02:00 |
|