l10n daemon script 7c6cabf4a1 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"		2020-12-20 06:16:31 +01:00
..
contents/ui	new delegate for search applet	2020-07-27 17:19:12 +02:00
Messages.sh	new applet to access KRunner functions	2020-02-05 19:57:44 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-12-20 06:16:31 +01:00