kdeconnect-kde/fileitemactionplugin
l10n daemon script 2a3a4bd717 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"
2020-09-19 09:40:24 +02:00
..
CMakeLists.txt Use ecm_qt_declare_logging_category to declare the logging categories 2020-05-26 18:55:47 +02:00
kdeconnectsendfile.json SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-19 09:40:24 +02:00
Messages.sh Restore FileItemActionPlugin 2019-04-15 22:36:34 +02:00
sendfileitemaction.cpp Use ecm_qt_declare_logging_category to declare the logging categories 2020-05-26 18:55:47 +02:00
sendfileitemaction.h Use ecm_qt_declare_logging_category to declare the logging categories 2020-05-26 18:55:47 +02:00