l10n daemon script e6a7df25aa 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"		2016-12-20 12:45:03 +01:00
..
CMakeLists.txt	Properly install the renamed files	2015-09-15 02:03:31 +02:00
kcm.cpp	Stop enforcing maximum size	2016-11-28 15:32:35 +01:00
kcm.h	Make capabilities static	2016-07-06 17:37:22 +02:00
kcm.ui	[KCM] Don't hardcode hyperlink color	2016-10-11 11:09:19 +02:00
kcm_kdeconnect.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 12:45:03 +01: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	2016-12-20 12:45:03 +01:00