l10n daemon script b4e008847a 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-11-25 04:58:17 +01: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-11-25 04:58:17 +01:00
Messages.sh	i18n fixes	2014-09-08 03:09:18 +02:00
sendfileitemaction.cpp	Preffer Q_FOREACH to foreach	2016-06-21 14:50:17 +02:00
sendfileitemaction.h	Clean up use of virtual and override keywords	2016-06-20 19:22:29 +02:00