Commit graph

6 commits

Author SHA1 Message Date
l10n daemon script
3d0acf15a5 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-27 05:13:07 +02:00
Nicolas Fella
3fe2e928c9 Revert "Remove unused desktop file"
It does have a purpose

This reverts commit af02ca1d08.
2019-06-13 19:18:25 +02:00
Nicolas Fella
af02ca1d08 Remove unused desktop file 2019-06-12 23:55:30 +02:00
l10n daemon script
d942b0201b 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-24 05:14:08 +02:00
Jonathan Riddell
edef9ed02a better category 2019-05-23 13:45:18 +01:00
Jonathan Riddell
c89bf8bd52 add some uninstalled appstream data, this is used by the new kde.org/applications site 2019-05-23 11:18:39 +01:00