kdeconnect-kde/plugins/lockdevice
l10n daemon script e57fd79f26 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-09-19 06:10:24 +02:00
..
CMakeLists.txt [plugins/lockdevice] Port to use logind interface 2020-08-28 11:58:22 +00:00
kdeconnect_lockdevice.json SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-19 06:10:24 +02:00
lockdeviceplugin.cpp [plugins/lockdevice] Port to use logind interface 2020-08-28 11:58:22 +00:00
lockdeviceplugin.h [plugins/lockdevice] Port to use logind interface 2020-08-28 11:58:22 +00:00
org.freedesktop.DBus.Properties.xml [plugins/lockdevice] Port to use logind interface 2020-08-28 11:58:22 +00:00
org.freedesktop.login1.xml [plugins/lockdevice] Port to use logind interface 2020-08-28 11:58:22 +00:00
org.freedesktop.ScreenSaver.xml Make it possible to lock the screen from KDE Connect 2015-07-22 03:37:34 +02:00