l10n daemon script fb39f01440 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"		2018-08-30 05:46:27 +02: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	Fix warning	2017-09-18 20:07:33 +02:00
deviceindicator.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
main.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
org.kde.kdeconnect.nonplasma.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-08-30 05:46:27 +02:00