l10n daemon script b7a6b1f00e 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-07-23 05:10:46 +02:00
..
CMakeLists.txt	Add wrapper for macos dbus connection	2019-06-09 15:28:49 +00:00
dialog.ui	[handler] Embed URL into string	2018-11-03 01:37:01 +01:00
kdeconnect-handler.cpp	Add ProxyModel for filtering for plugins	2019-07-21 15:51:13 +00:00
Messages.sh	Introduce a URL handler and offer handling tel:/// urls	2017-06-09 13:42:16 +02:00
org.kde.kdeconnect.smshandler.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-23 05:10:46 +02:00
org.kde.kdeconnect.telhandler.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-06-27 05:13:07 +02:00