l10n daemon script abd5d5940f SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"		2016-10-20 12:06:29 +00:00
..
CMakeLists.txt	Fix build after merge	2016-05-31 17:48:55 +02:00
kdeconnect_sendnotifications.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-10-20 12:06:29 +00:00
kdeconnect_sendnotifications_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-10-19 11:29:39 +00: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