kdeconnect-kde/fileitemactionplugin
l10n daemon script 9d6db94f7d 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-02-17 05:44:55 +01:00
..
CMakeLists.txt Port fileitemactionplugin to json metadata 2019-11-25 16:13:27 +01:00
kdeconnectsendfile.json SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-17 05:44:55 +01:00
Messages.sh Restore FileItemActionPlugin 2019-04-15 22:36:34 +02:00
sendfileitemaction.cpp Port fileitemactionplugin to json metadata 2019-11-25 16:13:27 +01:00
sendfileitemaction.h Restore FileItemActionPlugin 2019-04-15 22:36:34 +02:00