kdeconnect-kde/plugins/lockdevice
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
..
CMakeLists.txt Make it possible to lock the screen from KDE Connect 2015-07-22 03:37:34 +02:00
kdeconnect_lockdevice.json SVN_SILENT made messages (.desktop file) - always resolve ours 2017-06-08 04:52:02 +02:00
lockdeviceplugin.cpp Reduce API exposed through dbus 2017-01-10 18:15:01 +01:00
lockdeviceplugin.h Reduce API exposed through dbus 2017-01-10 18:15:01 +01:00
org.freedesktop.ScreenSaver.xml Make it possible to lock the screen from KDE Connect 2015-07-22 03:37:34 +02:00