l10n daemon script ac251b9878 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"		2026-10-05 01:51:33 +00:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2026-10-05 01:51:33 +00:00
CMakeLists.txt	Add the Show Desktop applet (moved from kdeplasma-addons)	2019-04-26 19:06:16 +02:00