l10n daemon script ab006521f8 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"		2018-01-28 05:06:41 +01: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	2017-09-19 04:58:52 +02:00
kdeconnect_sendnotifications_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-01-28 05:06:41 +01:00
notificationslistener.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
notificationslistener.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
notifyingapplication.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
notifyingapplication.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
notifyingapplicationmodel.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
notifyingapplicationmodel.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
sendnotification_debug.h	Split plugins for sending and receiving notifications	2016-05-25 12:49:13 -06:00
sendnotifications_config.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
sendnotifications_config.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
sendnotifications_config.ui	Remove cruft from send notifications ui file	2017-08-02 02:20:08 +02:00
sendnotificationsplugin.cpp	Split plugins for sending and receiving notifications	2016-05-25 12:49:13 -06:00
sendnotificationsplugin.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00