l10n daemon script baf52b49ac 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-04-08 11:04:09 +02:00
..
CMakeLists.txt	Remove non-toplevel project() definitions	2019-06-12 22:47:17 +02:00
kdeconnectd.cpp	Revert "Make default name and device type customizable"	2020-03-21 21:13:41 +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	2020-04-08 11:04:09 +02:00
org.kde.kdeconnect.service.in	Make sure kdeconnectd gets started when required	2015-09-10 20:21:41 +02:00