tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kdeconnect-kde/plugins/lockdevice
History
l10n daemon script fc2bd97e69 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"
2015-11-17 12:54:36 +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 2015-11-17 12:54:36 +00:00
lockdeviceplugin.cpp Make it possible to lock the screen from KDE Connect 2015-07-22 03:37:34 +02:00
lockdeviceplugin.h Make it possible to lock the screen from KDE Connect 2015-07-22 03:37:34 +02:00
org.freedesktop.ScreenSaver.xml Make it possible to lock the screen from KDE Connect 2015-07-22 03:37:34 +02:00