kdeconnect-kde/daemon
l10n daemon script af97d4476c 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"
2015-09-08 12:50:45 +00:00
..
CMakeLists.txt Drop dependency of KIO from kdeconnectcore 2015-05-05 01:07:29 +02:00
kdeconnect.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-09-08 12:50:45 +00:00
kdeconnectd.cpp run Clang Modernize 2015-09-08 10:47:37 +02:00
kdeconnectd.desktop.cmake more validation fixes 2015-08-26 08:29:34 -05: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 use LIBEXEC_INSTALL_DIR consistently (without CMAKE_INSTAL_PREFIX) 2015-08-26 07:01:35 -05:00