l10n daemon script baef9265d9 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-12-02 05:23:51 +01:00
..
CMakeLists.txt	Introduce a URL handler and offer handling tel:/// urls	2017-06-09 13:42:16 +02:00
dialog.ui	[handler] Embed URL into string	2018-11-03 01:37:01 +01:00
kdeconnect-handler.cpp	Missing Q_OBJECT macro	2018-11-06 23:28:25 +01:00
Messages.sh	Introduce a URL handler and offer handling tel:/// urls	2017-06-09 13:42:16 +02:00
org.kde.kdeconnect.telhandler.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-12-02 05:23:51 +01:00