l10n daemon script 5eb9a54bcc 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"		2016-02-05 09:16:28 +00:00
..
CMakeLists.txt	Fix typo in fileitemaction plugin's name	2015-11-25 17:38:58 +01:00
kdeconnectsendfile.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-02-05 09:16:28 +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	run Clang Modernize	2015-09-08 10:47:37 +02:00