kdeconnect-kde/data
l10n daemon script 885d311b31 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-07-28 01:41:47 +00:00
..
CMakeLists.txt Remove compatibility with Qt < 5.15 2023-07-18 20:13:27 +00:00
kdeconnect-dde.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2023-07-28 01:41:47 +00:00
kdeconnect-thunar.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2023-07-28 01:41:47 +00:00
kdeconnect.contract Add contract file 2018-11-03 01:37:30 +01:00
org.kde.kdeconnect.metainfo.xml GIT_SILENT made messages (after extraction) 2023-07-16 00:48:28 +00:00
org.kde.kdeconnect_open.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2023-07-28 01:41:47 +00:00