l10n daemon script f4211e0431 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"		2021-04-22 01:12:28 +00:00
..
CMakeLists.txt	kdeconnect_daemon: conditionally configure the daemon service to better support the windows port	2020-11-10 19:06:30 +05:30
kdeconnectd.cpp	Remove <br> from notification text	2021-03-18 22:04:10 +01: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	2021-04-22 01:12:28 +00:00
org.kde.kdeconnect.service.in	kdeconnect_daemon: conditionally configure the daemon service to better support the windows port	2020-11-10 19:06:30 +05:30