l10n daemon script e4e4c58b60 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"		2019-07-31 05:10:13 +02:00
..
CMakeLists.txt	Add wrapper for macos dbus connection	2019-06-09 15:28:49 +00:00
kdeconnectsendfile.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-31 05:10:13 +02:00
Messages.sh	Restore FileItemActionPlugin	2019-04-15 22:36:34 +02:00
sendfileitemaction.cpp	Force usage of QStringLiteral and port remaining offenders	2019-06-10 14:40:28 +00:00
sendfileitemaction.h	Restore FileItemActionPlugin	2019-04-15 22:36:34 +02:00