l10n daemon script cedd6f0c8b 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-06-29 05:17:17 +02:00
..
CMakeLists.txt	[SMS App] Make requestMoreMessages asynchronous, blocking, and caching	2018-12-12 22:42:56 -07:00
conversationsdbusinterface.cpp	Add sanity check to dbus-exposed requestConversation()	2019-05-01 12:47:33 +00:00
conversationsdbusinterface.h	Fix deviceTest	2019-05-01 12:46:02 +00:00
kdeconnect_sms.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-06-29 05:17:17 +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	Use K_PLUGIN_CLASS_WITH_JSON	2019-06-12 22:16:54 +02:00
smsplugin.h	Move ConversationsDbusInterface pointer handling to ConversationsDbusInterface	2019-03-29 22:30:13 +00:00