l10n daemon script f0eb32c350 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"		2016-10-19 09:02:51 +00: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	2016-10-19 09:02:51 +00:00
lockdeviceplugin.cpp	Introduce QVariantMap as an argument of NetworkPackage	2016-06-21 20:07:12 +02:00
lockdeviceplugin.h	Clean up use of virtual and override keywords	2016-06-20 19:22:29 +02:00
org.freedesktop.ScreenSaver.xml	Make it possible to lock the screen from KDE Connect	2015-07-22 03:37:34 +02:00