l10n daemon script 3efaae6f88 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-03 10:29:27 +00:00
..
CMakeLists.txt	Move some find_package dependencies to the children directories as agreed	2015-04-10 17:48:48 +02:00
kdeconnectsendfile.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-05-03 10:29:27 +00:00
Messages.sh	i18n fixes	2014-09-08 03:09:18 +02:00
sendfileitemaction.cpp	Fixed Dolphin's extension	2015-03-21 22:50:00 -07:00
sendfileitemaction.h	Port fileitemactionplugin free of KDELibs4Support	2014-09-23 19:33:03 +02:00