Albert Vaca 0dbaceafa3 Merge branch 'master' into 1.x ... # Conflicts: # plugins/battery/kdeconnect_battery.json # plugins/clipboard/kdeconnect_clipboard.json # plugins/findmyphone/kdeconnect_findmyphone.json # plugins/kdeconnect.notifyrc # plugins/lockdevice/kdeconnect_lockdevice.json # plugins/mousepad/kdeconnect_mousepad.json # plugins/mpriscontrol/kdeconnect_mpriscontrol.json # plugins/mprisremote/kdeconnect_mprisremote.json # plugins/notifications/kdeconnect_notifications.json # plugins/pausemusic/kdeconnect_pausemusic.json # plugins/ping/kdeconnect_ping.json # plugins/remotecommands/kdeconnect_remotecommands.json # plugins/remotecontrol/kdeconnect_remotecontrol.json # plugins/runcommand/kdeconnect_runcommand.json # plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json # plugins/sendnotifications/kdeconnect_sendnotifications.json # plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop # plugins/sftp/kdeconnect_sftp.json # plugins/share/kdeconnect_share.json # plugins/telephony/kdeconnect_telephony.json		2016-09-29 10:53:29 +02:00
..
CMakeLists.txt	Fix build after merge	2016-05-31 17:48:55 +02:00
kdeconnect_sendnotifications.json	Merge branch 'master' into 1.x	2016-09-29 10:53:29 +02:00
kdeconnect_sendnotifications_config.desktop	Merge branch 'master' into 1.x	2016-09-29 10:53:29 +02:00
notificationslistener.cpp	sendnotifications: also sync icon-data from notfication hints	2016-08-27 13:59:25 +02:00
notificationslistener.h	sendnotifications: also sync icon-data from notfication hints	2016-08-27 13:59:25 +02:00
notifyingapplication.cpp	Split plugins for sending and receiving notifications	2016-05-25 12:49:13 -06:00
notifyingapplication.h	More unused includes cleanup	2016-07-05 14:27:53 +02:00
notifyingapplicationmodel.cpp	More unused includes cleanup	2016-07-05 14:27:53 +02:00
notifyingapplicationmodel.h	Clean up use of virtual and override keywords	2016-06-20 19:22:29 +02:00
sendnotification_debug.h	Split plugins for sending and receiving notifications	2016-05-25 12:49:13 -06:00
sendnotifications_config.cpp	Split plugins for sending and receiving notifications	2016-05-25 12:49:13 -06:00
sendnotifications_config.h	Clean up use of virtual and override keywords	2016-06-20 19:22:29 +02:00
sendnotifications_config.ui	Split plugins for sending and receiving notifications	2016-05-25 12:49:13 -06:00
sendnotificationsplugin.cpp	Split plugins for sending and receiving notifications	2016-05-25 12:49:13 -06:00
sendnotificationsplugin.h	More unused includes cleanup	2016-07-05 14:27:53 +02:00