l10n daemon script d1d2677746 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-03-23 04:18:37 +00:00
..
CMakeLists.txt	Includes cleanup	2015-03-13 21:20:58 -07:00
kdeconnect.desktop	Fully replaced KDED for autostart + dbus activation, so we work outside KDE	2015-02-23 22:12:45 -08:00
kdeconnectd.cpp	Includes cleanup	2015-03-13 21:20:58 -07:00
kdeconnectd.desktop.cmake	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-03-23 04:18: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