l10n daemon script 5795e27191 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-10 11:33:23 +00:00
..
CMakeLists.txt	Move the DevicesSortProxyModel to interfaces/	2015-06-11 16:09:27 +02:00
kcm.cpp	Use acquire and release instead of a boolean property	2015-09-09 20:09:04 +02:00
kcm.h	Let the KPluginSelector react to changes in the plugin configuration	2015-09-08 20:03:44 +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-10 11:33:23 +00:00
kdeconnect.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-09-10 11:33:23 +00:00
Messages.sh	i18n	2013-09-04 21:19:02 +02:00