Commit graph

2 commits

Author SHA1 Message Date
l10n daemon script
bba2d33579 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-11 05:53:53 +02:00
Nicolas Fella
4b3f8a734d Install desktop file for kdeconnectd 2019-05-10 22:19:52 +00:00
Renamed from daemon/kdeconnectd.desktop.cmake (Browse further)