l10n daemon script 1634126eb5 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-07 10:16:35 +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	2020-04-07 10:16:35 +02:00
lockdeviceplugin.cpp	Rename DbusHelper => DBusHelper	2019-08-14 17:36:19 +02:00
lockdeviceplugin.h	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00
org.freedesktop.ScreenSaver.xml	Make it possible to lock the screen from KDE Connect	2015-07-22 03:37:34 +02:00