Commit graph

2 commits

Author SHA1 Message Date
l10n daemon script
8e3a03beb4 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-11-16 05:03:41 +01:00
Bhushan Shah
0828700d3e dialer: use QRC instead of the kpackage
And tidy up the code as well
2019-08-16 06:10:32 +00:00
Renamed from dialer/package/metadata.desktop (Browse further)