l10n daemon script cedd6f0c8b 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-29 05:17:17 +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	2019-06-29 05:17:17 +02:00
lockdeviceplugin.cpp	Use K_PLUGIN_CLASS_WITH_JSON	2019-06-12 22:16:54 +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