tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kdeconnect-kde/plugins/photo
History
l10n daemon script b44a067199 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-03-13 05:58:25 +01:00
..
CMakeLists.txt [plugins/photo] Don't link against KI18n 2019-03-11 19:11:26 +01:00
kdeconnect_photo.json SVN_SILENT made messages (.desktop file) - always resolve ours 2019-03-13 05:58:25 +01:00
photoplugin.cpp [plugins/photo] Don't link against KI18n 2019-03-11 19:11:26 +01:00
photoplugin.h [plugins/photo] Don't link against KI18n 2019-03-11 19:11:26 +01:00