l10n daemon script
|
bf51ceb600
|
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-24 09:52:53 +00:00 |
|
l10n daemon script
|
647d09b6fc
|
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-23 10:34:29 +00:00 |
|
l10n daemon script
|
eb5c099661
|
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-22 10:07:40 +00:00 |
|
Aleix Pol
|
be2a3252c2
|
Make it possible to lock the screen from KDE Connect
Connects to freedesktop ScreenSaver interface and un/locks it upon request.
REVIEW: 124170
|
2015-07-22 03:37:34 +02:00 |
|