Albert Vaca 0c95010c3b Merge branch 'master' into sslrefactor ... # Conflicts: # core/device.cpp # interfaces/devicesmodel.cpp		2016-04-14 19:00:42 -07:00
..
CMakeLists.txt	Properly install the renamed files	2015-09-15 02:03:31 +02:00
kcm.cpp	Fixed old signal name	2015-12-17 05:54:37 -08:00
kcm.h	Fixed old signal name	2015-12-17 05:54:37 -08:00
kcm.ui	Fixed typo	2015-12-17 08:49:34 -08:00
kcm_kdeconnect.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-02-14 09:18:22 +00: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-02-14 09:18:22 +00:00