kdeconnect-kde/urlhandler
l10n daemon script 470fdfef81 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"
2017-07-24 05:53:15 +02:00
..
CMakeLists.txt Introduce a URL handler and offer handling tel:/// urls 2017-06-09 13:42:16 +02:00
dialog.ui Introduce a URL handler and offer handling tel:/// urls 2017-06-09 13:42:16 +02:00
kdeconnect-handler.cpp Introduce a URL handler and offer handling tel:/// urls 2017-06-09 13:42:16 +02: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 2017-07-24 05:53:15 +02:00