l10n daemon script 057a114629 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"		2017-09-19 04:58:52 +02:00
..
CMakeLists.txt	Properly install the renamed files	2015-09-15 02:03:31 +02: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	Merge branch '1.x'	2017-07-12 11:37:41 +02:00
kcm_kdeconnect.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-09-19 04:58:52 +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	2017-09-19 04:58:52 +02:00