l10n daemon script c2ff5c5101 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-03-03 09:54:08 +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-03-03 09:54:08 +00:00
Messages.sh
sendfileitemaction.cpp
sendfileitemaction.h	run Clang Modernize	2015-09-08 10:47:37 +02:00