l10n daemon script f9db1e0fa5 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"		2015-09-22 12:23:31 +00:00
..
CMakeLists.txt	Properly install the renamed files	2015-09-15 02:03:31 +02:00
kcm.cpp	Fix reload when changing current device on the kcm	2015-09-12 19:43:15 +02:00
kcm.h	Fix reload when changing current device on the kcm	2015-09-12 19:43:15 +02:00
kcm.ui	Added a link to the Android app from the KCM	2015-03-23 00:39:36 -07:00
kcm_kdeconnect.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-09-22 12:23:31 +00: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	2015-09-22 12:23:31 +00:00