l10n daemon script e40312bf5e 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"		2018-06-18 05:27:46 +02:00
..
CMakeLists.txt	Clean-up requirements: cmake 3.0, qt 5.7, use min versions, deduplicate KF5	2018-03-17 23:34:33 +01:00
kdeconnectsendfile.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-18 05:27:46 +02:00
Messages.sh	i18n fixes	2014-09-08 03:09:18 +02:00
sendfileitemaction.cpp	[FileItemActionPlugin] Use kdeconnect icon for submenu with multiple devices	2018-03-14 15:16:28 +01:00
sendfileitemaction.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00