l10n daemon script 1d3368532a 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-02-26 05:29:15 +01:00
..
CMakeLists.txt	Don't use kcmshell5 for opening the KCM	2018-12-06 23:10:05 +01:00
kcm.cpp	Do not require Frameworks 5.45	2018-05-10 19:48:40 +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-02-26 05:29:15 +01:00
main.cpp	Don't use kcmshell5 for opening the KCM	2018-12-06 23:10:05 +01: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-01-31 05:44:46 +01:00