l10n daemon script dadcc76841 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-08-06 06:02:06 +02:00
..
CMakeLists.txt	Properly install the renamed files	2015-09-15 02:03:31 +02:00
kcm.cpp	Swapped labels	2017-08-02 02:59:41 +02:00
kcm.h	Expose pair requests on the KCM	2017-02-20 21:00:26 +01: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-08-06 06:02:06 +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-08-06 06:02:06 +02:00