l10n daemon script acdd83e100 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"		2023-10-21 01:20:48 +00:00
..
CMakeLists.txt	Use target-centric CMake approach for declaring debug category	2023-07-22 20:51:19 +00:00
kdeconnectsendfile.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-10-21 01:20:48 +00:00
Messages.sh	Restore FileItemActionPlugin	2019-04-15 22:36:34 +02:00
sendfileitemaction.cpp	Also use QLatin1String::arg in remaining places	2023-08-28 17:20:46 +00:00
sendfileitemaction.h	fileitemactionplugin: Use lambda connect to avoid ugly workarounds	2023-08-28 17:20:46 +00:00