l10n daemon script a794d51c4e 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-07-21 15:07:44 +00:00
..
CMakeLists.txt	Move the DevicesSortProxyModel to interfaces/	2015-06-11 16:09:27 +02:00
kcm.cpp	Removed some assertions that could not be true if using the model filter	2015-06-21 20:20:40 -07: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-07-21 15:07:44 +00:00
kdeconnect.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-06-30 13:47:48 +00:00
Messages.sh	i18n	2013-09-04 21:19:02 +02:00