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
..
qml	Show the announcedName in the qml app	2016-08-21 19:38:15 +02:00
CMakeLists.txt	Add desktop file for kcapp	2015-06-13 20:35:09 +02:00
main.cpp	Clazy says all this QStringLiteral and QLatin1String were missing/wrong	2016-11-26 16:21:29 +01:00
org.kde.kdeconnect.app.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-11-25 04:58:17 +01:00
resources.qrc	Improve how we handle the different plugin pages	2016-08-21 13:05:43 +02:00