kdeconnect-kde/daemon
l10n daemon script 0c32010a28 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-07-06 05:30:08 +02:00
..
CMakeLists.txt Use ecm_qt_declare_logging_category to declare the logging categories 2020-05-26 18:55:47 +02:00
kdeconnectd.cpp Use ecm_qt_declare_logging_category to declare the logging categories 2020-05-26 18:55:47 +02:00
Messages.sh Do not extract messages from the non-existent .ui and .rc files 2019-12-21 10:04:31 +02:00
org.kde.kdeconnect.daemon.desktop.cmake SVN_SILENT made messages (.desktop file) - always resolve ours 2020-07-06 05:30:08 +02:00
org.kde.kdeconnect.service.in Make sure kdeconnectd gets started when required 2015-09-10 20:21:41 +02:00