kdeconnect-kde/plugins/sendnotifications
l10n daemon script e55be85cf5 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-06-13 10:44:25 +00:00
..
CMakeLists.txt Fix build after merge 2016-05-31 17:48:55 +02:00
kdeconnect_sendnotifications.json Fix wording. 2016-06-02 21:04:02 +02:00
kdeconnect_sendnotifications_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2016-06-13 10:44:25 +00:00
notificationslistener.cpp Merge branch 'master' into sslrefactor 2016-06-03 00:48:15 +02:00
notificationslistener.h Merge branch 'master' into sslrefactor 2016-05-31 17:29:06 +02:00
notifyingapplication.cpp Split plugins for sending and receiving notifications 2016-05-25 12:49:13 -06:00
notifyingapplication.h Split plugins for sending and receiving notifications 2016-05-25 12:49:13 -06:00
notifyingapplicationmodel.cpp Split plugins for sending and receiving notifications 2016-05-25 12:49:13 -06:00
notifyingapplicationmodel.h Split plugins for sending and receiving notifications 2016-05-25 12:49:13 -06: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 Split plugins for sending and receiving notifications 2016-05-25 12:49:13 -06: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 Consistent naming of _REQUEST package type macros 2016-06-03 00:47:03 +02:00