l10n daemon script 08eaaf11e1 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-25 09:09:47 +00:00
..
CMakeLists.txt	Code styling	2015-03-21 23:12:04 -07:00
kdeconnectsendfile.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-03-25 09:09:47 +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