Albert Vaca 6a2a0b1c76 Merge branch '1.x' ... # Conflicts: # plugins/mpriscontrol/mpriscontrolplugin.cpp # plugins/sendnotifications/kdeconnect_sendnotifications.json		2016-11-26 16:40:24 +01: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-11-25 04:58:17 +01:00
lockdeviceplugin.cpp	Clazy says all this QStringLiteral and QLatin1String were missing/wrong	2016-11-26 16:21:29 +01:00
lockdeviceplugin.h	Clazy says all this QStringLiteral and QLatin1String were missing/wrong	2016-11-26 16:21:29 +01:00
org.freedesktop.ScreenSaver.xml	Make it possible to lock the screen from KDE Connect	2015-07-22 03:37:34 +02:00