kdeconnect-kde/settings
l10n daemon script 34da0ad9e1 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"
2022-09-05 01:43:43 +00:00
..
CMakeLists.txt Fix activating existing settings window on Wayland 2022-07-06 12:55:39 +00:00
main.cpp Fix activating existing settings window on Wayland 2022-07-06 12:55:39 +00:00
Messages.sh Move settings app into own folder and make it a KDBusService 2020-01-17 01:32:56 +01:00
org.kde.kdeconnect-settings.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2022-09-05 01:43:43 +00:00