kdeconnect-kde/plugins/sms
l10n daemon script 14994132f8 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-09-22 06:01:11 +02:00
..
CMakeLists.txt Split SMS and Telephony plugin on desktop 2018-09-10 11:31:05 +02:00
conversationsdbusinterface.cpp [Desktop] Allow SMS app to handle newly recieved messages 2018-09-16 16:20:45 -06:00
conversationsdbusinterface.h [Desktop] Allow SMS app to handle newly recieved messages 2018-09-16 16:20:45 -06:00
kdeconnect_sms.json SVN_SILENT made messages (.desktop file) - always resolve ours 2018-09-22 06:01:11 +02:00
smsplugin.cpp [Desktop] SMS plugin no longer creates desktop notifications -- Old functionality still supported by notifications plugin 2018-09-16 16:06:53 -06:00
smsplugin.h [Desktop] SMS plugin no longer creates desktop notifications -- Old functionality still supported by notifications plugin 2018-09-16 16:06:53 -06:00