Albert Vaca 6a2a0b1c76 Merge branch '1.x' ... # Conflicts: # plugins/mpriscontrol/mpriscontrolplugin.cpp # plugins/sendnotifications/kdeconnect_sendnotifications.json		2016-11-26 16:40:24 +01:00
..
CMakeLists.txt	Properly install the renamed files	2015-09-15 02:03:31 +02:00
kcm.cpp	Clazy says all this QStringLiteral and QLatin1String were missing/wrong	2016-11-26 16:21:29 +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-11-25 04:58:17 +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-11-25 04:58:17 +01:00