l10n daemon script 057a114629 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"		2017-09-19 04:58:52 +02: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	2017-09-19 04:58:52 +02:00
Messages.sh	i18n fixes	2014-09-08 03:09:18 +02:00
sendfileitemaction.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
sendfileitemaction.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00