l10n daemon script 397e6f69e3 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-05-26 13:51:37 +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-04-06 09:54:12 +00:00
kdeconnectd.cpp	Drop dependency of KIO from kdeconnectcore	2015-05-05 01:07:29 +02:00
kdeconnectd.desktop.cmake	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-05-26 13:51:37 +00: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	Fully replaced KDED for autostart + dbus activation, so we work outside KDE	2015-02-23 22:12:45 -08:00