l10n daemon script 0b1fbde12d 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-01-09 05:31:18 +01:00
..
CMakeLists.txt	[SMS App] Make requestMoreMessages asynchronous, blocking, and caching	2018-12-12 22:42:56 -07:00
conversationsdbusinterface.cpp	Handle case where more messages were requested but there were no more available from the remote	2018-12-14 09:59:42 -07:00
conversationsdbusinterface.h	[SMS App] Make requestMoreMessages asynchronous, blocking, and caching	2018-12-12 22:42:56 -07:00
kdeconnect_sms.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-09 05:31:18 +01:00
requestconversationworker.cpp	Handle case where more messages were requested but there were no more available from the remote	2018-12-14 09:59:42 -07:00
requestconversationworker.h	[SMS App] Make requestMoreMessages asynchronous, blocking, and caching	2018-12-12 22:42:56 -07:00
smsplugin.cpp	[SMS App] Allow scrolling up to load and display older messages	2018-12-12 22:50:50 -07:00
smsplugin.h	[SMS App] Make requestMoreMessages asynchronous, blocking, and caching	2018-12-12 22:42:56 -07:00