kdeconnect-kde/plugins/sms
l10n daemon script 58e2f142e0 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"
2019-05-01 05:56:02 +02:00
..
CMakeLists.txt [SMS App] Make requestMoreMessages asynchronous, blocking, and caching 2018-12-12 22:42:56 -07:00
conversationsdbusinterface.cpp Move ConversationsDbusInterface pointer handling to ConversationsDbusInterface 2019-03-29 22:30:13 +00:00
conversationsdbusinterface.h Move ConversationsDbusInterface pointer handling to ConversationsDbusInterface 2019-03-29 22:30:13 +00:00
kdeconnect_sms.json SVN_SILENT made messages (.desktop file) - always resolve ours 2019-05-01 05:56:02 +02:00
requestconversationworker.cpp Replace http GNU urls with https 2019-03-23 17:29:26 +01:00
requestconversationworker.h Replace http GNU urls with https 2019-03-23 17:29:26 +01:00
smsplugin.cpp Move ConversationsDbusInterface pointer handling to ConversationsDbusInterface 2019-03-29 22:30:13 +00:00
smsplugin.h Move ConversationsDbusInterface pointer handling to ConversationsDbusInterface 2019-03-29 22:30:13 +00:00