Commit graph

2 commits

Author SHA1 Message Date
l10n daemon script
bc7de626b6 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-06-18 08:48:58 +02:00
Nicolas Fella
f64bc76f8b Install desktop file for kdeconnectd
Fixes displayed appname in job notifications
2019-06-13 16:14:31 +02:00
Renamed from daemon/kdeconnectd.desktop.cmake (Browse further)