l10n daemon script aa009cfd85 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"		2024-06-09 01:17:55 +00:00
..
CMakeLists.txt	Cleanup all occurences of QT_MAJOR_VERSION in cmake	2023-12-28 17:49:07 +01:00
kdeconnectsendfile.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-06-09 01:17:55 +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