Commit Graph

2 Commits (ab69230b6b2511d477b588c540d361daf0e23548)

Author SHA1 Message Date
l10n daemon script d056b04483 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-05 05:57:15 +02:00
Jonathan Riddell 2a0d25f07d add .desktop file used for kde.org/applications generator 2019-05-03 14:55:58 +01:00