l10n daemon script 41e13c2e84 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-01-31 05:44:46 +01:00
..
CMakeLists.txt	Clean-up requirements: cmake 3.0, qt 5.7, use min versions, deduplicate KF5	2018-03-17 23:34:33 +01:00
deviceindicator.cpp	Add icons to indicator	2018-12-07 17:32:03 +01:00
deviceindicator.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
main.cpp	Add icons to indicator	2018-12-07 17:32:03 +01:00
org.kde.kdeconnect.nonplasma.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-31 05:44:46 +01:00