shift-shell

mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-27 06:33:08 +00:00

Author	SHA1	Message	Date
l10n daemon script	32ca26c5fa	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"	2022-07-22 01:43:12 +00:00
Alexander Lohnau	160cb0fcea	shell: Convert desktop file to JSON TO keep th ecopyright information, a .license file was created Task: https://phabricator.kde.org/T14558	2022-07-21 19:30:11 +00:00

Author

SHA1

Message

Date

l10n daemon script

32ca26c5fa

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"

2022-07-22 01:43:12 +00:00

Alexander Lohnau

160cb0fcea

shell: Convert desktop file to JSON

TO keep th ecopyright information, a .license file was created

Task: https://phabricator.kde.org/T14558

2022-07-21 19:30:11 +00:00

1 2