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	Fix typo in fileitemaction plugin's name	2015-11-25 17:38:58 +01:00
kdeconnectsendfile.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-11-25 04:58:17 +01:00
Messages.sh	i18n fixes	2014-09-08 03:09:18 +02:00
sendfileitemaction.cpp	Clazy says all this QStringLiteral and QLatin1String were missing/wrong	2016-11-26 16:21:29 +01:00
sendfileitemaction.h	Clean up use of virtual and override keywords	2016-06-20 19:22:29 +02:00