Commit Graph

8 Commits

Author SHA1 Message Date
Jonathan Riddell a4d7832f86 Add freedesktop.org keywords to .desktop file, Author: Jonathan Carter <jcarter@linux.com> 2017-09-13 15:17:41 +01:00
l10n daemon script 931b1e90e0 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"
2017-09-13 08:45:37 +02:00
l10n daemon script 385507c3cb 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"
2017-09-12 04:49:41 +02:00
l10n daemon script 688b21f9f7 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"
2017-09-11 04:50:44 +02:00
l10n daemon script d70c1ab373 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"
2017-09-10 04:50:43 +02:00
l10n daemon script 1dd8e32d40 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"
2017-09-08 04:30:49 +02:00
Andrius Štikonas 421515dcaa Add partition;disk keywords to the desktop file. 2017-09-06 14:12:15 +01:00
Andrius Štikonas 4e3fddc6eb Rename desktop/appdata files to lowercase.
This is necessary for icons to work in Plasma Wayland session.
2017-04-09 00:28:04 +01:00