l10n daemon script c52ee5f316 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-08-01 08:25:00 +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
kcm.cpp	Merge branch 'master' into 1.x	2017-09-03 22:05:54 +02:00
kcm.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
kcm.ui	Fix ui file hint: KMessageWidget extends QFrame in KF5 times	2018-03-22 17:34:54 +01:00
kcm_kdeconnect.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-01 08:25:00 +02:00
Messages.sh	i18n	2013-09-04 21:19:02 +02:00
org.kde.kdeconnect.kcm.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-31 08:58:38 +02:00