l10n daemon script 92cd693566 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-03-29 09:58:52 +00:00
..
CMakeLists.txt	Fix build	2015-03-14 14:33:12 +01:00
devicessortproxymodel.cpp	Sort devices alphabetically in KCM	2015-03-22 23:08:37 -07:00
devicessortproxymodel.h	Minor changes	2014-08-11 18:57:48 +02:00
kcm.cpp	Added a link to the Android app from the KCM	2015-03-23 00:39:36 -07:00
kcm.h	You can now change your name (the one seen by other devices on the network)	2015-03-01 21:23:05 -08: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-03-29 09:58:52 +00:00
kdeconnect.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-03-29 09:58:52 +00:00
Messages.sh	i18n	2013-09-04 21:19:02 +02:00