kdeconnect-kde/plugins/lockdevice
l10n daemon script acdd83e100 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"
2023-10-21 01:20:48 +00:00
..
CMakeLists.txt kdeconnect_add_plugin: Autogenerate logging category 2023-08-07 19:47:41 +02:00
kdeconnect_lockdevice.json SVN_SILENT made messages (.desktop file) - always resolve ours 2023-10-21 01:20:48 +00:00
lockdeviceplugin-win.cpp plugins: Use QLatin1String::arg for faster and simpler string concatination 2023-08-28 17:20:46 +00:00
lockdeviceplugin-win.h Simplify KDEConnectPlugin::recievePacket 2023-08-03 20:49:44 +02:00
lockdeviceplugin.cpp plugins: Use QLatin1String::arg for faster and simpler string concatination 2023-08-28 17:20:46 +00:00
lockdeviceplugin.h Simplify KDEConnectPlugin::recievePacket 2023-08-03 20:49:44 +02:00