tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kdeconnect-kde/fileitemactionplugin
History
l10n daemon script ac2ac5ba20 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-05-04 05:49:17 +02:00
..
CMakeLists.txt Restore FileItemActionPlugin 2019-04-15 22:36:34 +02:00
kdeconnectsendfile.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-05-04 05:49:17 +02:00
Messages.sh Restore FileItemActionPlugin 2019-04-15 22:36:34 +02:00
sendfileitemaction.cpp Restore FileItemActionPlugin 2019-04-15 22:36:34 +02:00
sendfileitemaction.h Restore FileItemActionPlugin 2019-04-15 22:36:34 +02:00