l10n daemon script
|
43ea8052fe
|
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-08 06:32:15 +02:00 |
|
l10n daemon script
|
7eee223dfc
|
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-03-02 05:46:53 +01:00 |
|
l10n daemon script
|
cb307e16b2
|
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-11-17 05:06:27 +01:00 |
|
Aleix Pol
|
8d6136f953
|
wayland: we need the input interface to be able to use the remote capabilities
|
2019-09-05 16:57:38 +02:00 |
|
l10n daemon script
|
392d287b64
|
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-08-11 04:47:22 +02:00 |
|
l10n daemon script
|
3d0acf15a5
|
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-06-27 05:13:07 +02:00 |
|
l10n daemon script
|
bba2d33579
|
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-05-11 05:53:53 +02:00 |
|
Nicolas Fella
|
4b3f8a734d
|
Install desktop file for kdeconnectd
|
2019-05-10 22:19:52 +00:00 |
|