l10n daemon script f92534583d 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-11-13 10:40:06 +00:00
..
CMakeLists.txt	Properly install the renamed files	2015-09-15 02:03:31 +02:00
kcm.cpp	Introduce bare documentation for the KDE Connect kcm	2015-10-19 03:25:17 +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 wiki from the KCM.	2015-10-18 15:08:36 -07:00
kcm_kdeconnect.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-11-11 10:30:30 +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-11-13 10:40:06 +00:00