l10n daemon script d4074b42fa 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-06-15 09:58:46 +00:00
..
CMakeLists.txt	Move the DevicesSortProxyModel to interfaces/	2015-06-11 16:09:27 +02:00
kcm.cpp	QML-ify	2015-06-13 01:28:36 +02:00
kcm.h	Merge pairingSuccessful and unpaired signals into pairingChanged(bool)	2015-06-11 16:19:00 +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-06-15 09:58:46 +00:00
kdeconnect.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-06-15 09:58:46 +00:00
Messages.sh	i18n	2013-09-04 21:19:02 +02:00