l10n daemon script f814a2c8f6 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"		2020-10-17 06:06:46 +02:00
..
CMakeLists.txt	Replace manual include dir handling with interface target	2020-07-30 10:53:48 +02:00
dialog.ui	Allow to wrap label, so when we have a big url as when we send	2019-08-16 13:37:32 +02:00
kdeconnect-handler.cpp	Convert license headers to SPDX expressions	2020-08-17 09:48:10 +00:00
Messages.sh	Introduce a URL handler and offer handling tel:/// urls	2017-06-09 13:42:16 +02:00
org.kde.kdeconnect.handler.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-10-17 06:06:46 +02:00