l10n daemon script 3d0acf15a5 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"		2019-06-27 05:13:07 +02:00
..
CMakeLists.txt	Allow kdeconnectd auto launch from kdeconnect-indicator on macOS	2019-06-09 21:36:42 +00:00
deviceindicator.cpp	Force usage of QStringLiteral and port remaining offenders	2019-06-10 14:40:28 +00:00
deviceindicator.h	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00
main.cpp	Fix system tray icon on macOS	2019-06-18 20:51:13 +00:00
org.kde.kdeconnect.nonplasma.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-06-27 05:13:07 +02:00