kdeconnect-kde/plugins/lockdevice
l10n daemon script a05ab9f841 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-12-02 05:47:37 +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-12-02 05:47:37 +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