l10n daemon script b72a3e53f6 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"		2019-03-31 09:30:09 +02:00
..
CMakeLists.txt	Clean-up requirements: cmake 3.0, qt 5.7, use min versions, deduplicate KF5	2018-03-17 23:34:33 +01:00
kdeconnect.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-03-31 09:30:09 +02:00
kdeconnectd.cpp	Add a method for creating simple notifications	2018-03-18 12:52:22 +01:00
kdeconnectd.desktop.cmake	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-03-31 09:30:09 +02:00
Messages.sh	Fully replaced KDED for autostart + dbus activation, so we work outside KDE	2015-02-23 22:12:45 -08:00
org.kde.kdeconnect.service.in	Make sure kdeconnectd gets started when required	2015-09-10 20:21:41 +02:00