kdeconnect-kde/plugins/sms
l10n daemon script 19bea39619 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-10-28 04:53:25 +01:00
..
CMakeLists.txt Split SMS and Telephony plugin on desktop 2018-09-10 11:31:05 +02:00
conversationsdbusinterface.cpp [Desktop] Update conversation list when a new message arrives 2018-10-07 21:46:39 -06:00
conversationsdbusinterface.h [Desktop] Update conversation list when a new message arrives 2018-10-07 21:46:39 -06:00
kdeconnect_sms.json SVN_SILENT made messages (.desktop file) - always resolve ours 2018-10-28 04:53:25 +01:00
smsplugin.cpp Correct braces and add contributors 2018-10-06 21:59:15 -06:00
smsplugin.h Correct braces and add contributors 2018-10-06 21:59:15 -06:00